Commit Graph

29404 Commits

Author SHA1 Message Date
keronshb
5498d7ed13 Reverts unintended area changes to other maps 2021-11-21 10:50:22 -05:00
keronshb
146ada0d3d Removes anchored from jacq 2021-11-20 23:54:16 -05:00
keronshb
af83fb9611 FestiveMap 2021 2021-11-20 12:04:35 -05:00
Putnam3145
cf4cc39a3b Merge pull request #15222 from raspy-on-osu/apcfix
save hours of pain for new engineers with this one simple trick!! click here to find out
2021-11-18 20:18:11 -08:00
Putnam3145
1e01852b93 Merge pull request #15320 from shellspeed1/working-on-new-fancy-syringe-guns
Improvements to the reagent gun and brand new smart dart repeater. [Ready]
2021-11-17 17:09:23 -08:00
Lin
b10e9def21 Merge pull request #15360 from SandPoot/tgui_emergency
Emergency tgui fixing measures
2021-11-17 16:35:16 +00:00
Lin
efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
Lin
4e407ffeb6 Merge pull request #15371 from DeltaFire15/unintended-devastation
Devastation level explosions no longer delete organs of gibbed humans
2021-11-17 16:19:23 +00:00
Lin
ce1a400617 Merge pull request #15373 from DeltaFire15/reebe-testing
Reebe now has a proc to load it
2021-11-17 16:15:06 +00:00
Putnam3145
2cdc3a9d30 makes regal rat require not being dead to use abilities 2021-11-15 21:02:52 -08:00
DeltaFire
0e93bd84f8 no funky relay decon and wackyness 2021-11-16 02:22:12 +01:00
DeltaFire
cf777da85f success if already loaded 2021-11-15 17:54:32 +01:00
DeltaFire
9ae59be10e lies 2021-11-14 22:47:35 +01:00
DeltaFire
3f9ad6a954 should do this instead 2021-11-14 22:44:43 +01:00
DeltaFire
314a3a049f lets just return true instead 2021-11-14 22:38:48 +01:00
DeltaFire
50c7d4914f reebe loading (woo) 2021-11-14 22:25:39 +01:00
DeltaFire
88789e1bbe one 2021-11-14 22:06:52 +01:00
DeltaFire
6224da71a3 contents_explosion
at least this one had less overrides.
2021-11-14 21:41:42 +01:00
DeltaFire
6aa906395c not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
DeltaFire
7d2ff194d1 this WILL fail CI
hnnnngh
2021-11-14 20:48:41 +01:00
Putnam3145
5f6a692a08 Makes ashwalkers not freeze to death on lavaland
their lungs can't handle 280 or below lol
2021-11-13 15:52:09 -08:00
Lin
91adaf84b6 Merge pull request #15330 from keronshb/dynamiclog
Dynamic messages admins if it fails to hijack.
2021-11-13 04:50:43 +00:00
Lin
9f443c9285 Merge pull request #15362 from Putnam3145/teg-fix
Makes TEG generate heat based on actual heat transfer (again)
2021-11-13 04:42:53 +00:00
Lin
dbee2f0a8a Merge pull request #15363 from Putnam3145/fix-freezer-math
Changes freezer/heater "efficiency" display on examine to something meaningful
2021-11-13 04:41:53 +00:00
shellspeed1
8ab281dfd6 make hot swap work properly 2021-11-12 19:21:45 -08:00
shellspeed1
e3407c5b39 unfucks a few things post comments. 2021-11-12 19:00:17 -08:00
Lin
d431254427 Merge pull request #15354 from Putnam3145/fix-stupid
Nerf chonker in cuban pete arcade game
2021-11-13 00:01:08 +00:00
shellspeed1
030f078445 Update code/modules/projectiles/guns/misc/chem_gun.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:22:32 -08:00
shellspeed1
f67cf99757 Update code/modules/projectiles/guns/misc/chem_gun.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:22:19 -08:00
shellspeed1
329336f5ed Update code/modules/projectiles/ammunition/special/syringe.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:19:06 -08:00
shellspeed1
6363d9a447 Update code/modules/projectiles/guns/misc/chem_gun.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:18:35 -08:00
shellspeed1
b8078d0a63 Update code/modules/projectiles/guns/misc/chem_gun.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:18:29 -08:00
shellspeed1
47da4007f7 Update code/modules/projectiles/ammunition/special/syringe.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:18:04 -08:00
shellspeed1
76324ed06a Update code/modules/research/designs/medical_designs.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:17:49 -08:00
shellspeed1
71a4b7ba00 Update code/modules/research/designs/medical_designs.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:17:39 -08:00
shellspeed1
5ae433138e Update code/modules/projectiles/guns/misc/chem_gun.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:17:32 -08:00
shellspeed1
dc3e651674 Update code/modules/projectiles/guns/misc/chem_gun.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:16:39 -08:00
shellspeed1
9c7f1fdfca Update code/modules/projectiles/guns/misc/chem_gun.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:16:21 -08:00
shellspeed1
142b74ed5d Update code/modules/projectiles/ammunition/special/syringe.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:15:07 -08:00
Putnam3145
71e6676e9a ( 2021-11-11 17:53:00 -08:00
Putnam3145
a3b6ac7b54 Fixes freezer display + fixing bad math 2021-11-11 17:46:48 -08:00
Putnam3145
be9f550261 removed gross extra space 2021-11-11 17:43:38 -08:00
Putnam3145
25687a81f0 Makes TEG generate heat based on heat again 2021-11-11 17:38:49 -08:00
SandPoot
b5f35da60d Update client_procs.dm 2021-11-11 13:23:05 -03:00
Putnam3145
7df63ed6f5 Nerf chonker/temper 2021-11-10 16:20:43 -08:00
keronshb
0aceecee2e w hitsound 2021-11-10 16:49:18 -05:00
silicons
c11d769388 Update _lists.dm 2021-11-09 20:17:34 -07:00
Putnam3145
0b0a7192f9 removes the "REM" macro 2021-11-09 16:35:32 -08:00
silicons
5b5eca2beb Merge pull request #15322 from SandPoot/crayon-precision
Crayon precision mode
2021-11-09 09:56:03 -08:00
Lin
93eb2ae444 Merge pull request #15346 from Putnam3145/last-lung-fix-bluh
Fixes simultaneous suffocate/overbreathe
2021-11-09 03:37:03 +00:00