bunny232
|
3f3ccadde5
|
Merge branch 'Citadel-Station-13:master' into tempfeel
|
2021-12-08 05:21:22 -05:00 |
|
DeltaFire
|
f0ff064dc1
|
missed a line
|
2021-12-08 05:12:32 +01:00 |
|
DeltaFire
|
04797a961b
|
linters b gone
|
2021-12-08 05:07:22 +01:00 |
|
evan
|
0ca84b7cc5
|
Update species.dm
woops, forgot something
|
2021-12-07 22:11:56 -05:00 |
|
evan
|
5a7dbfe9ef
|
Update pool_controller.dm
|
2021-12-07 21:50:16 -05:00 |
|
evan
|
afe6179191
|
Update species.dm
|
2021-12-07 21:39:17 -05:00 |
|
evan
|
2099f18506
|
Update pool_controller.dm
|
2021-12-07 21:28:30 -05:00 |
|
DeltaFire
|
e576962ac3
|
e
|
2021-12-03 18:29:13 +01: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 |
|
Lin
|
336a66edd5
|
Merge pull request #15386 from keronshb/winterball2021
FestiveMap (Winter Ball 2021)
|
2021-11-27 23:44:51 +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
|
43aa80f9e7
|
Merge pull request #15397 from SandPoot/lewdcap-
Allows toggling of Captain's female formal outfit's legs
|
2021-11-26 17:47:50 -07:00 |
|
SandPoot
|
3618248b4e
|
Upload files
|
2021-11-24 23:11:12 -03: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 |
|
Lin
|
f33af9b35c
|
Merge pull request #15392 from timothyteakettle/fix-oil-drum
oil drum now recognises synthetic anthormorphs as synths
|
2021-11-23 21:55:07 +00:00 |
|
silicons
|
38f7e07bcc
|
Update living.dm (#15394)
|
2021-11-23 18:36:51 +01:00 |
|
Timothy Teakettle
|
d9276418ae
|
Update anthropomorph.dm
|
2021-11-22 00:15:42 +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
|
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 |
|
Lin
|
5b0fe8d392
|
Merge pull request #15381 from DeltaFire15/battery-supply
Synthetics can now hook up their power cord to cells instead of relying on moth-esque code
|
2021-11-20 07:04:15 +00:00 |
|
Lin
|
22d297abe8
|
Merge pull request #15382 from keronshb/clockworkupdates
Allows Clockwork cultists to create Cogscarabs.
|
2021-11-20 07:03:32 +00: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 |
|
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 |
|
MrJWhit
|
47cf0c153a
|
Update loot_pile.dm
|
2021-11-17 18:36:49 -05: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 |
|
keronshb
|
7b195c3973
|
Cogscarabs
The return
|
2021-11-16 22:41:08 -05:00 |
|
DeltaFire
|
855df65ba2
|
cord cell charge
|
2021-11-16 22:56:31 +01:00 |
|
DeltaFire
|
ef9c90d512
|
embeds, unarmed and wounds
|
2021-11-16 20:26:38 +01:00 |
|
Putnam3145
|
2cdc3a9d30
|
makes regal rat require not being dead to use abilities
|
2021-11-15 21:02:52 -08:00 |
|
DeltaFire
|
cf767252f6
|
effect multipler
|
2021-11-16 02:57:00 +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 |
|
DeltaFire
|
cf777da85f
|
success if already loaded
|
2021-11-15 17:54:32 +01:00 |
|
SandPoot
|
5b85c260a7
|
Upload files
|
2021-11-15 01:34:30 -03:00 |
|