cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,249 Commits 55 Branches 0 Tags
5116acad15f301d528039606cb63af6bff3bbcf2
Commit Graph

81 Commits

Author SHA1 Message Date
SandPoot
7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -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
SandPoot
543b18c435 oops shrug 2023-01-09 17:55:51 -03:00
SandPoot
d743096f8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-09 17:50:19 -03:00
Jerry Wester
ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot
d527d28ef7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-07 22:58:19 -03:00
SandPoot
82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03: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
05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
Maksxpl
c8082e1009 Compliance with standards (#134) 
* enjoy

* Update shuttles.dm

sowwy

Co-authored-by: Maksxpl <18237380+maksxpl@users.noreply.github.com>
 2021-01-19 12:44:08 -03:00
SandPoot
d6d2e3e6d0 Updates suit storage units to be inline with tg's also adds a slot for shoes/boots. (#129) 
* upload initial files (does work already)

* shoes slot
 2021-01-10 15:36:28 -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