Lin
|
e506bc50dc
|
Merge pull request #15335 from DeltaFire15/synth-chem-time
Synth / IPC kinda-buffs - Chemwarfare Edition
|
2021-12-01 00:39:02 +00:00 |
|
Lin
|
5dc9704e5d
|
Merge pull request #15380 from DeltaFire15/oops-all-wounds
Block & Pellet wound pass
|
2021-11-30 20:24:42 +00:00 |
|
Linzolle
|
3084ef1231
|
areas and power and atmos oh my
|
2021-11-26 20:50:39 -07:00 |
|
Linzolle
|
776f69e119
|
turfs go in the turfs file and it is too cold
|
2021-11-26 19:53:33 -07:00 |
|
Linzolle
|
afe81f711b
|
Merge branch 'winterball2021' of github.com:keronshb/Citadel-Station-13 into winterball
|
2021-11-26 18:46:57 -07:00 |
|
Lin
|
d5c17f0d84
|
Merge pull request #15376 from SandPoot/double
Double beds
|
2021-11-24 17:38:10 +00:00 |
|
Lin
|
e3a5391250
|
Merge pull request #14868 from Arturlang/admin_mapsave
buildmode mapgen tool save [ready]
|
2021-11-24 17:32:48 +00:00 |
|
keronshb
|
5498d7ed13
|
Reverts unintended area changes to other maps
|
2021-11-21 10:50:22 -05:00 |
|
Chayse Ramsay
|
31a0de04d5
|
Fixes chem nades too, since fixing grenades as a whole broke them changing timer
|
2021-11-21 06:24:55 +00:00 |
|
Chayse Ramsay
|
9545b180c6
|
Update grenade.dm
|
2021-11-21 06:08:20 +00:00 |
|
keronshb
|
af83fb9611
|
FestiveMap 2021
|
2021-11-20 12:04:35 -05:00 |
|
Lin
|
1de965a90e
|
Merge pull request #15385 from buffyuwu/crayons.dm
dont color my entire canvas neon green when im painting please
|
2021-11-20 03:36:38 +00:00 |
|
Lin
|
d395824007
|
Merge pull request #15383 from MrJWhit/thinnining-trash
Thins up the loot piles
|
2021-11-20 03:35:56 +00:00 |
|
Lin
|
43e4c71d04
|
Merge pull request #15384 from SandPoot/acid-bgone
Acid overlay no longer lingers after done
|
2021-11-19 23:02:49 +00:00 |
|
Artur
|
99dedb54ed
|
Merge remote-tracking branch 'upstream/master' into admin_mapsave
|
2021-11-20 00:16:56 +02: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 |
|
buffyuwu
|
612087f7e5
|
Update crayons.dm
|
2021-11-18 20:44:01 -05:00 |
|
SandPoot
|
9d3857c94e
|
Upload files
|
2021-11-18 14:57:19 -03:00 |
|
MrJWhit
|
47cf0c153a
|
Update loot_pile.dm
|
2021-11-17 18:36:49 -05: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 |
|
DeltaFire
|
ef9c90d512
|
embeds, unarmed and wounds
|
2021-11-16 20:26:38 +01:00 |
|
DeltaFire
|
0e93bd84f8
|
no funky relay decon and wackyness
|
2021-11-16 02:22:12 +01:00 |
|
SandPoot
|
ca3eaca314
|
update bedsheet_bin.dm
|
2021-11-15 20:48:11 -03:00 |
|
SandPoot
|
5b85c260a7
|
Upload files
|
2021-11-15 01:34:30 -03:00 |
|
DeltaFire
|
3f9ad6a954
|
should do this instead
|
2021-11-14 22:44:43 +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 |
|
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 |
|
DeltaFire
|
b4e6b0785d
|
chemscan
chemscanning (reads: health analyzers mostly) show reagents in grey if not processable due to being invalid
|
2021-11-12 19:38:10 +01: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
|
5b5eca2beb
|
Merge pull request #15322 from SandPoot/crayon-precision
Crayon precision mode
|
2021-11-09 09:56:03 -08:00 |
|
Putnam3145
|
b7b69fdeda
|
Fixes power alarm not to be precisely wrong
|
2021-11-07 09:27:13 -08:00 |
|
Putnam3145
|
b2459a26a3
|
Merge pull request #15306 from keronshb/dynamicadjustments
Adjusts Dynamic requirements to be more lienent (less 24/7 traitor and maybe a chance for something else holy shit)
|
2021-11-04 16:27:58 -07:00 |
|
Lin
|
74c6e05dd7
|
Merge pull request #15318 from silicons/evil
removes some evil defines from the code
|
2021-11-04 04:32:48 +00:00 |
|
keronshb
|
e20b5f7c92
|
Dynamicadmins
Messages admins if dynamic fails to hijack
|
2021-11-03 22:39:20 -04:00 |
|
keronshb
|
efd12e4fd5
|
Changes for merge
|
2021-11-01 12:07:44 -04:00 |
|
SandPoot
|
d92a290960
|
Update crayons.dm
|
2021-11-01 01:50:30 -03:00 |
|
SandPoot
|
05717c7ae3
|
Upload files
|
2021-11-01 01:24:47 -03:00 |
|
Lin
|
b6ad2f6a6b
|
Merge pull request #15312 from keronshb/evergreen
The grinch can no longer steal Christmas.
|
2021-10-30 14:08:59 -07:00 |
|
keronshb
|
b58d3f14a3
|
More adjustments
|
2021-10-30 10:24:58 -04:00 |
|
silicons
|
a32eabb7ae
|
fix
|
2021-10-29 22:44:01 -07:00 |
|
silicons
|
186b552103
|
merge
|
2021-10-29 21:50:58 -07:00 |
|
silicons
|
319c5e23fe
|
Merge pull request #15309 from LetterN/revert-15244-tgui-alerts-and-what-not
Revert "TGUI alerts, lists, inputs"
|
2021-10-29 20:27:46 -07:00 |
|
Lin
|
5054ea87ce
|
Merge pull request #15310 from keronshb/jaqincinerator
No Frollo you can't burn Jacq in the cremator with hellfire (plus two other grief prevention additions)
|
2021-10-28 21:29:50 -07:00 |
|
keronshb
|
133225c083
|
Removes required enemies
|
2021-10-28 23:48:50 -04:00 |
|