Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
f657dff
Adds more slots to CM/CE/Ranger/Forgemaster and Explorer (#305)
BadAtThisGame302 Feb 4, 2022
cd78efd
Stimpaks (and Supers) make you hungry, and poison you if you're starv…
SeniorScore Feb 5, 2022
8d43f3b
Fermichem recipes for Super Stimfluid, Jet, Turbo, Psycho, Med-X and …
lolman360 Feb 5, 2022
c34ad76
multi-z shit, areas fix included (#301)
Jaaackx Feb 5, 2022
cfb58aa
tribspek (#312)
lolman360 Feb 5, 2022
2141ae8
veteran ranger buff pr (shotgun loadout) (#292)
lolman360 Feb 5, 2022
5d33510
makes superstim recipes take fluid instead of stimpaks (#321)
lolman360 Feb 6, 2022
f525ba2
Thigh High Meta (#309)
OliOliOnsiPree Feb 6, 2022
1855c54
adjusts command whitelist (#323)
zulixe Feb 6, 2022
3e3f684
adjusts superstim recipe to not be obscene, adds blur to healing powd…
SeniorScore Feb 6, 2022
8a911f8
roundstart empty (fillable) bloodbags (#322)
lolman360 Feb 6, 2022
7936ed7
MedX nerf, Service rifle change. (#317)
DaemonTinadel Feb 6, 2022
19f39fc
Removes dildos and some associated code + minesweeper removal (TESTME…
Jaaackx Feb 6, 2022
47b8197
Update autolathe.dm
cornercube Feb 7, 2022
f7253a4
Update machine_circuitboards.dm
cornercube Feb 7, 2022
467b6dd
Update autolathe.dm
cornercube Feb 7, 2022
70c1ad9
Update _techweb.dm
cornercube Feb 7, 2022
4d4b319
Fixing Poultice/Bitter eye blur, makes dealing with burns easier. (#324)
SeniorScore Feb 7, 2022
cc74869
shield fix (#327)
lolman360 Feb 7, 2022
b35e1fe
stimpak crafting fixes (#329)
lolman360 Feb 7, 2022
6593f2a
Heavy Duty Sheath, Ranger Cape Fix, Crafting Additions (#303)
SeniorScore Feb 7, 2022
f98d27b
reduces the rate of nutrition loss from stimpaks (#331)
SeniorScore Feb 9, 2022
7f4b24a
follower vending update (#300)
cornercube Feb 10, 2022
ee5e99b
Legion Immunes (#315)
SeniorScore Feb 10, 2022
32ff35a
Update f13lootdrop.dm (#325)
cornercube Feb 10, 2022
a30d689
armor, loadouts, balancing, guns, oh my (#286)
cornercube Feb 10, 2022
91a1b00
Remove sprinting from the movement sprite. (#334)
ElisavetPinko Feb 10, 2022
9c8c977
Gives sheaths a functioning icon (#332)
SeniorScore Feb 10, 2022
366eb67
upgraded varmint rifle (ghetto ratslayer) (#328)
lolman360 Feb 10, 2022
55d9b98
tribal buffs ('new' arrow type, support for faction damage bonus on p…
lolman360 Feb 10, 2022
805f7fb
Fixes binos, maybe. (#338)
scheveningensun Feb 11, 2022
8ee3e04
show your love for nuka cola (#310)
cornercube Feb 11, 2022
2767718
Adds a Second Floor to the Yuma Bank (#320)
BadAtThisGame302 Feb 12, 2022
cb3bece
autoaxe/steelsaw buffs/changes (#337)
lolman360 Feb 12, 2022
96302c1
Makes moving NOT give you nutrition anymore. #15316 (#351)
TripleShades Feb 12, 2022
d1c8969
Fully removes Minesweeper (#350)
TripleShades Feb 12, 2022
ace624d
fixes vet legionaire not getting a .357 revolver (#356)
SeniorScore Feb 13, 2022
2181538
Port "Let Me Tell You A Story" #14123 (#345)
TripleShades Feb 13, 2022
b08bd6b
Some hallucination tweaks #14960 (#349)
TripleShades Feb 13, 2022
a0009dc
Auto Guns (#288)
Tron-117 Feb 13, 2022
b54c98b
Update legion.dm (#342)
Jawnner Feb 15, 2022
5c70f8e
fortnite nerf (removes unsupported lattice building) (#340)
lolman360 Feb 15, 2022
6f6aa7e
weekly armor update: laser edition (#339)
cornercube Feb 15, 2022
fac2996
New Loadout Items (Smokers/Army Officers Rejoice) (#343)
Jawnner Feb 15, 2022
516618b
Port of "Makes the microwave cleanable by the damp rag" #14121 (#344)
TripleShades Feb 15, 2022
3afa328
you can now shove yourself up on any intent #14130 (#346)
TripleShades Feb 15, 2022
6124eb4
Ports Breaking a mirror now gives you a bad omen #14930 (#347)
TripleShades Feb 15, 2022
3ba9ad8
[PORT] Stripping a disconnected player will tell them when they come …
TripleShades Feb 15, 2022
50aeb6c
legion explorer sniper is dead, long live legion explorer enfielder (…
lolman360 Feb 15, 2022
916064d
heavily nerfs synthtissue (#361)
lolman360 Feb 15, 2022
502a8a8
neck tilting (people can look up now) (#341)
lolman360 Feb 15, 2022
23b22e0
Ranger Station Oscar (#358)
BadAtThisGame302 Feb 15, 2022
bee9005
buffs medicine/drug yield from fermichem recipes heavily (#365)
lolman360 Feb 15, 2022
985c18a
a new carpet for the BAR (#355)
cornercube Feb 15, 2022
dfb6b2c
bow rework (functionally a nerf to all non-tribals) (#353)
lolman360 Feb 18, 2022
5f96c84
yuma book club: a literate wasteland is a happy wasteland (#354)
cornercube Feb 19, 2022
e548b5a
outlaw arms race begins (#366)
cornercube Feb 19, 2022
e68ade3
makes crushers craftable, buffs them into usability, alllows hostile …
lolman360 Feb 19, 2022
22e7005
ability to cancel actions (#370)
lolman360 Feb 19, 2022
84e3904
crayon precision mode port (#371)
lolman360 Feb 19, 2022
1947caa
armor value examining fixes (#372)
lolman360 Feb 19, 2022
9776015
Flowers Update + Pumpkins + Crowns + Misc (#381)
OliOliOnsiPree Feb 19, 2022
300f292
people now show how long they've been afk/disconnected for on examine…
lolman360 Feb 21, 2022
b79ece8
Changes the sprite of some of the legion armors Mk.2 (#392)
Eluxor Feb 21, 2022
836fb0b
Lets Rangers get utility vests from loadout. (#385)
CatteNoire Feb 22, 2022
dab05ae
sprite fix,BAR full-auto stats,fixes police rifle/assault carbine (#375)
cornercube Feb 22, 2022
45f6ea4
Adds the Bone Dancer tribal loadout + objects (#374)
Eluxor Feb 24, 2022
cb32435
alternate pathway for making most drugs (#379)
lolman360 Feb 24, 2022
09e624e
med-sci treasure: science is its own reward (#382)
cornercube Feb 24, 2022
fadf5da
primitive chemistry/grinder improvements (#383)
lolman360 Feb 24, 2022
136d425
sadomaschoism (#387)
lolman360 Feb 24, 2022
c538bd7
salvaging buffs (#386)
lolman360 Feb 24, 2022
749da35
Hotfixes various meta exploit bullshit (#396)
scheveningensun Feb 24, 2022
0e73c99
Update belt.dm (#394)
Jawnner Feb 26, 2022
0ca5df9
remove pin (#398)
CatteNoire Feb 26, 2022
25ba6e6
Swaps R91 to Gauss Rifle for Senior Paladin (#400)
CatteNoire Feb 26, 2022
74beec4
Update f13factionarmor.dm (#401)
CatteNoire Feb 26, 2022
f8bc140
loreworthy 9mm+ slight cut to gunbloat (#391)
cornercube Feb 26, 2022
ff19aaa
lootspawn/guns balance pass (granularizes loot spawners, changes loot…
lolman360 Mar 2, 2022
f2cd8e0
ammu-nation specialty ammunition update (#399)
lolman360 Mar 2, 2022
47f7835
Update head.dm (#406)
lolman360 Mar 2, 2022
5171d30
seeds and rose (#395)
OliOliOnsiPree Mar 4, 2022
ff2a394
quickclaw dungeon 'improvements' (more loot + quickclaw buff) (#402)
lolman360 Mar 4, 2022
9f2389a
mine rework/ beartrap availability (#404)
lolman360 Mar 4, 2022
4572b17
tribal armor changes (buff) (#405)
lolman360 Mar 5, 2022
c8f773d
Update recipes_forge.dm (#408)
CatteNoire Mar 5, 2022
cd53d76
Update preferences.dm (#410)
lolman360 Mar 5, 2022
2866f12
power armor changes/emp changes (#411)
lolman360 Mar 5, 2022
cbd0034
khan door craftable (#412)
lolman360 Mar 5, 2022
f2b51c6
Anvil Adjustment (Nerf) (#431)
CatteNoire Mar 5, 2022
b92aa1f
Centurion David and Goliath (readds goliath powerfist to palacent) (#…
CatteNoire Mar 5, 2022
71c540a
General Weapons Adjustments (#415)
CatteNoire Mar 5, 2022
e4d447b
Update f13factionhead.dm (#413)
CatteNoire Mar 5, 2022
b06e4f0
yes (#419)
CatteNoire Mar 5, 2022
cefd270
Update bos.dm (#420)
CatteNoire Mar 5, 2022
c433e54
Local Legion mugs Veteran Ranger for NVGs (#423)
CatteNoire Mar 5, 2022
782bf2f
Carl Gustaf Veteran Legionnaire loadout (#424)
CatteNoire Mar 5, 2022
ce4f5c9
pa emp rework again (#433)
lolman360 Mar 7, 2022
ed1ae9b
trainshot nerf (#434)
lolman360 Mar 7, 2022
7f4d267
Added Playable Super Mutants (#432)
TinkleTingler Mar 9, 2022
a394858
weekly armor and armament balance PR: plating nerf edition (#397)
cornercube Mar 9, 2022
9553b58
blacksmithing rebalance (#436)
lolman360 Mar 9, 2022
40106ab
salvaging buffs (#438)
lolman360 Mar 9, 2022
934ef39
buffout buff (#440)
lolman360 Mar 9, 2022
f7ec2b2
barbecue sauce - "Ahm I gehtin ah moar.. Sweet tangy, Byte?" (#437)
OliOliOnsiPree Mar 9, 2022
32eb6ca
ammo nerfs (#439)
lolman360 Mar 9, 2022
332f44c
speargun changes (#446)
lolman360 Mar 9, 2022
7fefeb0
reverts back longpork to molerat stew (#447)
OliOliOnsiPree Mar 9, 2022
8b65029
powerfist refactor (#441)
lolman360 Mar 11, 2022
f2791f5
Pre-built Fortifications (NCR/Legion) (#393)
Jawnner Mar 11, 2022
9f34012
Goodbye Oasis Sheriff's Office, hello Oasis Police Department (#435)
Jawnner Mar 11, 2022
bbb4e25
shield balance pass + tower shields + ACTUALLY kills linearmor (#442)
lolman360 Mar 12, 2022
0f3b34c
Made the survival kit craftable (#448)
QuacksQ Mar 12, 2022
018a08e
survivalkit nerf/refactor (#449)
lolman360 Mar 12, 2022
cdd4e7c
bos (#457)
lolman360 Mar 12, 2022
84cff01
yes (#444)
CatteNoire Mar 13, 2022
86a034f
Revert "yes (#444)" (#464)
scheveningensun Mar 14, 2022
3c3a4bb
Adds Orator (#454)
Kitsunemitsu Mar 14, 2022
1e62e1e
Update legion.dm (#452)
donQiHoyTay Mar 14, 2022
8b99ffb
Revert "Revert "yes (#444)" (#464)" (#465)
scheveningensun Mar 15, 2022
9637c13
Khan Second Story Boogaloo (#445)
OliOliOnsiPree Mar 15, 2022
da559b1
reverts NCR helmets to 'old' sprites (#450)
spackcorp Mar 15, 2022
5de445b
G11 HP loadout/WT550 SP loadout (#453)
lolman360 Mar 15, 2022
e1872d0
Adds Stripper Clips to Ammolathe (#455)
Jawnner Mar 15, 2022
0d19ec6
Update oasis.dm (#456)
Jawnner Mar 15, 2022
7391fbf
eyebots drop themselves as loot (#461)
cornercube Mar 16, 2022
f35d238
Plasma Musket nerfed, Plasma Cannon added, Dean's Electronics lockout…
biotear Mar 16, 2022
352663e
Merge branch 'LoneStarF13:master' into cornercube-ghettolathe
cornercube Mar 17, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
25 changes: 12 additions & 13 deletions _maps/RandomZLevels/VR/yuma_VR.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@
id = "vrlock1";
max_integrity = 9600
},
/obj/effect/mine/shrapnel/sting,
/obj/item/mine/shrapnel/sting,
/turf/open/floor/carpet/green,
/area/awaymission/vr/bos/casino)
"cA" = (
Expand Down Expand Up @@ -1933,7 +1933,7 @@
/obj/item/gun/ballistic/automatic/pistol/beretta,
/obj/item/gun/ballistic/automatic/pistol/deagle,
/obj/item/gun/ballistic/automatic/pistol/m1911,
/obj/item/gun/ballistic/automatic/pistol/m1911/compact,
/obj/item/gun/ballistic/automatic/pistol/m1911,
/obj/item/gun/ballistic/automatic/pistol/mk23,
/obj/item/gun/ballistic/automatic/pistol/n99,
/obj/item/gun/ballistic/automatic/pistol/ninemil/maria,
Expand All @@ -1946,7 +1946,7 @@
/obj/item/gun/ballistic/automatic/hobo/zipgun,
/obj/item/gun/ballistic/revolver,
/obj/item/gun/ballistic/revolver/colt357,
/obj/item/gun/ballistic/revolver/colt6520,
/obj/item/gun/ballistic/automatic/pistol/n99,
/obj/item/gun/ballistic/revolver/m29,
/obj/item/gun/ballistic/revolver/m29/snub,
/obj/item/gun/ballistic/revolver/police,
Expand Down Expand Up @@ -2124,7 +2124,6 @@
},
/area/awaymission/vr/bos/enclavebunker)
"mZ" = (
/obj/item/fusion_fuel,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/f13{
icon_state = "redrustyfull"
Expand Down Expand Up @@ -2294,7 +2293,7 @@
/obj/item/gun/ballistic/automatic/smg/mp5,
/obj/item/gun/ballistic/automatic/smg/p90,
/obj/item/gun/ballistic/automatic/smg/ppsh,
/obj/item/gun/ballistic/automatic/smg/rockwell,
/obj/item/gun/ballistic/automatic/smg/greasegun,
/obj/item/gun/ballistic/automatic/smg/smg10mm,
/obj/item/gun/ballistic/automatic/smg/tommygun,
/turf/open/floor/holofloor/plating,
Expand Down Expand Up @@ -3400,7 +3399,7 @@
/obj/machinery/door/poddoor{
id = "vrlock2"
},
/obj/effect/mine/shrapnel/sting,
/obj/item/mine/shrapnel/sting,
/turf/open/floor/carpet/green,
/area/awaymission/vr/bos/casino)
"ww" = (
Expand Down Expand Up @@ -4084,7 +4083,7 @@
id = "vrlock1";
max_integrity = 9600
},
/obj/effect/mine/shrapnel/sting,
/obj/item/mine/shrapnel/sting,
/turf/open/floor/carpet/green,
/area/awaymission/vr/bos/casino)
"By" = (
Expand Down Expand Up @@ -4134,7 +4133,7 @@
/obj/machinery/door/poddoor{
id = "vrlock3"
},
/obj/effect/mine/shrapnel/sting,
/obj/item/mine/shrapnel/sting,
/turf/open/floor/carpet/green,
/area/awaymission/vr/bos/casino)
"BX" = (
Expand Down Expand Up @@ -4876,7 +4875,7 @@
/obj/machinery/door/poddoor{
id = "vrlock3"
},
/obj/effect/mine/shrapnel/sting,
/obj/item/mine/shrapnel/sting,
/turf/open/floor/carpet/green,
/area/awaymission/vr/bos/casino)
"IG" = (
Expand Down Expand Up @@ -5027,7 +5026,7 @@
"JL" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/dirt,
/obj/effect/mine/shrapnel/sting,
/obj/item/mine/shrapnel/sting,
/obj/machinery/door/poddoor{
id = "vrlock2"
},
Expand Down Expand Up @@ -5588,7 +5587,7 @@
},
/area/awaymission/vr/bos/deathmatch)
"Oh" = (
/obj/effect/mine/shrapnel/sting,
/obj/item/mine/shrapnel/sting,
/obj/machinery/door/poddoor{
id = "vrlock1";
max_integrity = 9600
Expand Down Expand Up @@ -6437,7 +6436,7 @@
/obj/machinery/door/poddoor{
id = "vrlock2"
},
/obj/effect/mine/shrapnel/sting,
/obj/item/mine/shrapnel/sting,
/turf/open/floor/carpet/green,
/area/awaymission/vr/bos/casino)
"Vk" = (
Expand Down Expand Up @@ -6589,7 +6588,7 @@
/area/awaymission/vr/bos/casino)
"Wf" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mine/shrapnel/sting,
/obj/item/mine/shrapnel/sting,
/obj/machinery/door/poddoor{
id = "vrlock1";
max_integrity = 9600
Expand Down
10 changes: 5 additions & 5 deletions _maps/RandomZLevels/away_mission/wildwest.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@
/turf/open/floor/wood,
/area/awaymission/wildwest/mines)
"cB" = (
/obj/effect/mine/gas/plasma,
/obj/item/mine/gas/plasma,
/obj/item/ammo_box/c10mm,
/turf/open/floor/plating/ironsand{
icon_state = "ironsand1"
Expand Down Expand Up @@ -906,7 +906,7 @@
/turf/open/floor/wood,
/area/awaymission/wildwest/mines)
"dv" = (
/obj/effect/mine/gas/plasma,
/obj/item/mine/gas/plasma,
/obj/item/ammo_box/c10mm,
/turf/open/floor/wood,
/area/awaymission/wildwest/mines)
Expand Down Expand Up @@ -1178,7 +1178,7 @@
},
/area/awaymission/wildwest/mines)
"ek" = (
/obj/effect/mine/gas/plasma,
/obj/item/mine/gas/plasma,
/turf/open/floor/plasteel/cafeteria{
dir = 5
},
Expand Down Expand Up @@ -1384,7 +1384,7 @@
/turf/open/floor/plasteel,
/area/awaymission/wildwest/refine)
"eS" = (
/obj/effect/mine/gas/plasma,
/obj/item/mine/gas/plasma,
/turf/open/floor/wood,
/area/awaymission/wildwest/mines)
"eT" = (
Expand Down Expand Up @@ -1657,7 +1657,7 @@
/turf/open/floor/plasteel,
/area/awaymission/wildwest/refine)
"fB" = (
/obj/effect/mine/gas/plasma,
/obj/item/mine/gas/plasma,
/turf/open/floor/plating/ironsand{
icon_state = "ironsand1"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/DR2sPrefabs.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6069,7 +6069,7 @@
/turf/open/indestructible/ground/inside/mountain,
/area/space)
"rT" = (
/obj/effect/landmark/start/f13/slavemaster,
/obj/effect/landmark/start/f13/immune,
/turf/open/indestructible/ground/inside/mountain,
/area/space)
"rU" = (
Expand Down
Loading