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
Lin
b6ad2f6a6b
Merge pull request #15312 from keronshb/evergreen
...
The grinch can no longer steal Christmas.
2021-10-30 14:08:59 -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
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
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
Linzolle
a4a72b1b16
make plasmemes not die in ghost cafe
2021-10-24 17:27:32 -07:00
SandPoot
45ef0fe5ca
closes #15278
2021-10-17 21:40:39 -03:00
SandPoot
829ca8b9a7
Merge branch 'master' into tgui-alerts-and-what-not
2021-10-11 20:41:56 -03:00
Timothy Teakettle
11df2bb77c
fixes emps not working on lockers ( #15259 )
...
* Update closets.dm
* Update code/game/objects/structures/crates_lockers/closets.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2021-10-11 00:48:00 +02:00
SandPoot
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
WanderingFox95
fe8a652689
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-19 21:32:03 +02:00
zerothebigboy
68e2eb1d7a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
2021-09-10 12:12:57 -04:00
zerothebigboy
3c23a09b56
bannedforbeingcringeist
2021-09-07 21:10:24 -04:00
keronshb
ea3b248e6c
Ports Parade outfit changes
2021-09-05 14:17:52 -04:00
zerothebigboy
ccfde52b0d
code
2021-09-02 23:45:03 -04:00
Artur
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
Artur
3100f98b90
https://github.com/tgstation/tgstation/pull/57915
2021-07-28 02:13:57 +03:00
Artur
cdbd585f4d
update_appearance
2021-07-28 02:13:57 +03:00
silicons
224fb7f22c
Update tables_racks.dm
2021-07-21 21:34:10 -07:00
silicons
d38a775a16
Update tables_racks.dm
2021-07-21 21:33:46 -07:00
WanderingFox95
9e9686c0cd
Removing unused code altogether.
2021-07-21 19:42:58 +02:00
silicons
16622ac95a
Update tables_racks.dm
2021-07-20 18:06:49 -07:00
WanderingFox95
36db1c1f87
Removes Recipe Limit
2021-07-20 19:00:29 +02:00
silicons
093df245b3
Merge pull request #14930 from keronshb/mirroromenport
...
Ports Breaking a mirror now gives you a bad omen
2021-07-18 15:06:03 -07:00
keronshb
c92952c3b0
Cit changes for bullet path
2021-07-06 22:57:31 -04:00
keronshb
fc153b04d3
breaking a mirror is bad for your health ( #58381 )
2021-07-06 22:47:02 -04:00
Putnam3145
899e74fc83
Componentized acid
2021-07-03 22:10:44 -07:00
Putnam3145
f3b590f5f0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps
2021-06-30 02:19:02 -07:00
Lin
0bfb671f4e
Merge pull request #14482 from silicons/combat_v7
...
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
2021-06-27 13:04:29 -07:00
Putnam3145
fbbae70527
i need to go to bed and this is a LOT
2021-06-21 10:14:50 -07:00
Putnam3145
dbdc3001ba
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-16 23:33:14 -07:00
silicons
8595e05ad9
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-13 15:37:35 -07:00
silicons
431acd9d5c
Merge pull request #14820 from qweq12yt/more-cargo-stuff
...
[FIX] Some cargo related fixes
2021-06-13 15:15:20 -07:00
Putnam
833d34ba8e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-11 16:28:12 -07:00
qweq12yt
0ca61af62a
fixed combo lockers
2021-06-10 16:50:44 -03:00
silicons
fe8323f503
Merge pull request #14747 from keronshb/reinforcedplasmawindowsteps
...
Adds more deconstruction steps to stronger windows.
2021-06-09 11:13:13 -07:00
Putnam
86177c51c4
auxgm part 1
...
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
silicons
40f2c06f2e
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-07 16:47:11 -07:00
Putnam
d03bf641dd
extreme optimization project to maybe fix game
2021-06-06 21:58:24 -07:00
silicons
cb52be5dd9
fixes linter warnings ( #14778 )
...
* woo
* woo
2021-05-31 10:19:20 -05:00
keronshb
13b589507d
Clown Spawner
...
For admin fun!
2021-05-24 15:13:41 -04:00
keronshb
7458909970
Switched heated screws to solder.
2021-05-23 13:36:03 -04:00
keronshb
8787caccba
Fixes the roundstart deconstruction issue
2021-05-22 14:12:31 -04:00
keronshb
bd05dd29b6
ReinforcedPlasmaSteps
...
Adds more steps for deconning stronger windows
2021-05-22 13:58:01 -04:00
