 SandPoot
|
67cfd000fe
|
Upload files
|
2021-12-16 12:57:21 -03:00 |
|
|
DeltaFire
|
0faac6dce6
|
hoo boy
|
2021-12-14 23:06:42 +01:00 |
|
|
BlueWildrose
|
0e3d30e59f
|
Merge branch 'Citadel-Station-13:master' into wingport
|
2021-12-11 12:53:03 -07:00 |
|
|
Lin
|
f89729afb7
|
Merge pull request #15421 from DeltaFire15/more_overrides
Fixes even more linter stuff
|
2021-12-11 18:08:33 +00:00 |
|
|
Putnam3145
|
629ce5bea6
|
Station traits
|
2021-12-08 16:17:35 -08:00 |
|
|
keronshb
|
6ab0d1b70c
|
Adds Clock Cult to the midround pool. (#15338)
* Midround Clock Cult
Adds midround clock cultists
* Is eligible
* Reebe load proc
* Moves load reebe
* One tab out
|
2021-12-08 19:06:11 +01:00 |
|
|
DeltaFire
|
50be57f107
|
grrrr
|
2021-12-08 18:33:06 +01:00 |
|
|
Cognition
|
3b52782ae5
|
Merge branch 'master' into wingport
|
2021-12-08 00:02:13 -07:00 |
|
|
DeltaFire
|
04797a961b
|
linters b gone
|
2021-12-08 05:07:22 +01:00 |
|
|
Cognition
|
318240bdc6
|
TG wing port - Now YOU TOO, can be an "angel"
|
2021-12-07 18:59:07 -07:00 |
|
|
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 |
|
|
Putnam3145
|
0ef0991d65
|
another tweak to it, for good measure
|
2021-11-26 22:49:30 -08:00 |
|
|
Putnam3145
|
2558789015
|
Adjusted bomb numbers
|
2021-11-26 20:18:47 -08: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 |
|
|
LetterN
|
8dcfea5817
|
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
|
2021-11-21 10:34:14 +08: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 |
|
|
LetterN
|
fa6946fae4
|
added the funny. Also adds balloon_alert to more stuff (primarily atmos)
|
2021-11-16 16:10:12 +08:00 |
|
|
DeltaFire
|
0e93bd84f8
|
no funky relay decon and wackyness
|
2021-11-16 02:22:12 +01:00 |
|
|
LetterN
|
cca584b2df
|
should finally fix dragging other people into cryo
|
2021-11-16 08:37:48 +08:00 |
|
|
Putnam3145
|
1da28b8ec6
|
Chem gas tweaks, + toxins rebalance
|
2021-11-15 16:29:30 -08: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 |
|
|
LetterN
|
01ebc25f7f
|
fixes vending BSOD and reverts cryopod regressio
|
2021-11-15 10:37:10 +08: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 |
|
|
LetterN
|
eb98848a9f
|
wires this code to the PROPER prefs
|
2021-11-14 09:23:08 +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 |
|