keronshb
5498d7ed13
Reverts unintended area changes to other maps
2021-11-21 10:50:22 -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
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
0e93bd84f8
no funky relay decon and wackyness
2021-11-16 02:22:12 +01: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
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
keronshb
02eb4685a9
Some adjustments
2021-10-28 23:44:02 -04:00
keronshb
e531c7b452
Fix
2021-10-28 18:48:26 -04:00
keronshb
6dcf4fae9f
No stealing christmas
2021-10-28 11:28:59 -04:00
keronshb
e8c56c07ee
No burning the spirit of halloween
2021-10-28 00:43:02 -04:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
silicons
9010dc1e41
Merge pull request #15298 from keronshb/whocodedthis
...
Fixes DSword and Hyper Eu's wounding, and fixes a slowdown bug with Hyper Eu.
2021-10-27 13:35:41 -07:00
SandPoot
13d7a166fe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-27 13:54:49 -03:00
silicons
e5faee5774
Merge pull request #15254 from Putnam3145/dynamic-better-extended
...
Dynamic extended: antags allowed, but only later
2021-10-27 05:15:22 -07:00
silicons
679189cb3d
Merge pull request #15277 from Hatterhat/autoloom
...
i've been sitting on this a while but here have the AUTOLOOM
2021-10-27 05:13:40 -07:00
silicons
cbc266214d
Merge pull request #15303 from Linzolle/ghostcafe-plasma
...
make plasmemes not die in ghost cafe
2021-10-27 05:12:22 -07:00
silicons
d6d037de43
Merge pull request #15232 from Putnam3145/minesweeper-removal
...
Removes minesweeper
2021-10-27 05:11:48 -07:00
keronshb
ccb65156ac
Adjustments and fixes
2021-10-26 12:53:50 -04:00
keronshb
50986b279e
Requirement rework
2021-10-25 21:14:25 -04:00
WanderingFox95
4b13d1772c
[Ready] Bone Anvil and processable Bone ingots ( #15290 )
...
* Adding all the extra stuff
* whoops, slipped my last fix in here.
* bone balance
* 6 Goliaths + 3 Watchers + 1 Legion
* bumps the damage modifier down to 1.05
* More Bones.
* Undoes the undoing of the other fix PR
Co-authored-by: Emily <null>
2021-10-25 18:11:54 +02:00
Linzolle
a4a72b1b16
make plasmemes not die in ghost cafe
2021-10-24 17:27:32 -07:00
Putnam3145
53d7682a25
how embarassing!
2021-10-23 20:35:07 -07:00
Putnam3145
c26737a533
better rework: based on sec instead of pop on extended
2021-10-23 20:27:38 -07:00
Putnam3145
620721e89e
No more "WE NEED ANTAGS" rolls
2021-10-23 19:59:12 -07:00
keronshb
ff9439d223
Dsword Wound and slowdown fix
2021-10-22 23:04:19 -04:00
Putnam3145
343689ca42
even more proper
2021-10-19 00:07:14 -07:00
