SandPoot
c07e94be66
push
2024-08-24 21:28:55 -03:00
SandPoot
a65f323734
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
2024-03-08 19:10:22 -03:00
SandPoot
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
SandPoot
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
KrissKr0ss
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33 , reversing
changes made to efb2d19cb9 .
2023-05-01 00:16:20 -05:00
Jerry Wester
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
Jerry Wester
dae5190941
Remove sandstorm edit, fix suit storage
2022-12-11 20:45:46 -07:00
Jerry Wester
f7ac3c7624
beeg commit
2022-12-11 20:32:35 -07:00
PeriodicChaos
183b554ed3
modsuits part 1
2022-12-11 20:30:41 -07:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
Letter N
b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
Letter N
d5a6a3ecd9
actual code chang
2020-07-22 12:02:31 +08:00
silicons
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
silicons
1a040dd2a6
changes
2020-07-18 18:44:17 -07:00
silicons
7c5d4f863d
click cd breakout
2020-07-18 18:10:21 -07:00
Artur
80b47ec1c0
Ports https://github.com/tgstation/tgstation/pull/50497
2020-04-23 09:55:28 +03:00
ancientpower
56ba8ef127
requested changes
2020-03-01 12:45:00 -06:00
ancientpower
5c5ec541ae
Merge branch 'master' into paramedic-tweaks
2020-02-29 01:55:46 -06:00
ancientpower
12ba71f588
paramedic tweaks
2020-02-27 23:23:44 -06:00
Ghommie
fc76cd9a9b
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
Ghom
6f66d76680
Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
...
Cleanup/Partial revert of RGB blood ""rework""
2020-02-02 19:08:57 +01:00
kevinz000
24cbe67f27
optimizations, unnecessary crap, undocumented ipc change
2020-01-24 21:18:19 -07:00
Artur
255f2ce449
Testmerge Conflict fix?
2020-01-22 20:17:42 +01:00
Artur
8b8a112d2c
Ohkay
2020-01-15 09:41:33 +02:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
lolman360
aed866339f
pickup pickup pickup pickup 100% pickup
2019-11-17 12:00:17 +11:00
Poojawa
394c947d14
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-11 23:10:45 -05:00
kevinz000
bcc92d234b
Merge pull request #9386 from Sishen1542/suitrad
...
Gives suit storage units the ability to remove radiation from mobs
2019-10-11 12:13:04 -07:00
Sishen
0abcbe0fb5
Update suit_storage_unit.dm
2019-10-01 23:49:46 -04:00
Poojawa
0482973e8f
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-01 22:38:12 -05:00
Poojawa
30e6445c0a
Suit Storage now purges radation contamination
2019-09-28 03:18:31 -05:00
Poojawa
f57bdc39a2
I still fucking hate components.
2019-09-23 02:03:37 -05:00
Poojawa
23333f6ea5
reverts the majority of clean act because it doesn't work properly otherwise
2019-08-20 23:03:31 -05:00
Poojawa
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
Poojawa
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
Trilbyspaceclone
4da50828f7
Update suit_storage_unit.dm
2019-05-22 18:31:36 -04:00
Poojawa
971ddef989
reverts forensics components. If I can't figure it out, MURDER IT
2019-05-22 04:10:29 -05:00
Poojawa
9374e83e7d
fixes armor plate oversight
2019-05-01 00:05:14 -05:00
Trilbyspaceclone
415c1de16d
adds magboots
2018-12-13 11:13:11 -05:00
Poojawa
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
deathride58
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
Jordan Brown
5e15a988f6
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
ShizCalev
b5a95e9da8
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
kevinz000
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
81Denton
7caad40e3f
Fixes lavaland syndie base rads + SSU compartment issues ( #37252 )
...
* radsuit SSU, syndie lava base rad protection
* re-adds missing combat gloves
* defines radsuit SSU name by the obj
2018-04-18 07:02:10 -05:00
CitadelStationBot
738df3f400
[MIRROR] fixes breaking SSUs ( #6057 )
...
* fixes breaking SSUs (#36577 )
* fixes breaking SSUs
2018-03-22 06:06:21 -05:00
Poojawa
03086dfa91
Tg 1 28 sync testing/confirmation ( #5178 )
...
* maps, tgui, tools
* defines and helpers
* onclick and controllers
* datums
fucking caught that hulk reversal too.
* game and shuttle modular
* module/admin
* oh god they fucking moved antag shit again
* haaaaate. Haaaaaaaaaate.
* enables moff wings
* more modules things
* tgstation.dme
before I forget something important
* some mob stuff
* s'more mob/living stuff
* some carbon stuff
* ayy lmaos and kitchen meat
* Human stuff
* species things
moff wings have a 'none' version too
* the rest of the module stuff.
* some strings
* misc
* mob icons
* some other icons.
* It compiles FUCK BORERS
FUCK BORERS
2018-01-29 04:42:29 -06:00
oranges
269208f687
[READY]Component Forensics and Item Blood OverlayS!
2017-12-27 15:19:14 -06:00
ACCount
435e46e407
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -06:00
Emmett Gaines
ea36d5944e
More radiation balance changes and fixes ( #32051 )
...
* more balance changes and fixes
* cleanup
2017-10-27 03:08:03 -05:00