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-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,906 Commits 55 Branches 0 Tags
1654a925b69e421daf76589bb601cf549bee14bd
Commit Graph

36906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lolman360
1654a925b6 Update smoke_machine.dm 2020-08-19 18:26:53 +10:00
lolman360
e82772dc44 kekw 2020-08-19 17:22:52 +10:00
lolman360
e00c383b1a Update belt.dm 2020-08-18 20:19:54 +10:00
lolman360
7390effcb9 e 2020-08-18 19:09:01 +10:00
lolman360
36bcc3a869 Merge branch 'plumb' of https://github.com/lolman360/Citadel-Station-13 into plumb 2020-08-18 18:57:35 +10:00
lolman360
b466a5aae9 e 2020-08-18 18:57:23 +10:00
lolman360
4e23559065 Update sheet_types.dm 2020-08-18 18:15:24 +10:00
lolman360
9931cb006c eee 2020-08-18 17:33:20 +10:00
lolman360
d8e286d7be ee 2020-08-18 16:17:00 +10:00
lolman360
325f4eb72e Updates 2 2020-08-18 15:43:44 +10:00
lolman360
3040032409 documentation updates 2020-08-18 15:42:19 +10:00
lolman360
f2a86f2c42 Update medical_designs.dm 2020-08-18 14:23:09 +10:00
lolman360
8356dbf20a Update medical_designs.dm 2020-08-18 13:26:32 +10:00
lolman360
32c0335a17 Update medical_designs.dm 2020-08-18 10:35:56 +10:00
lolman360
2f14d8998b Update autohydro.dm 2020-08-17 22:42:41 +10:00
lolman360
6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
CitadelStationBot
dc799858d1 Automatic changelog generation for PR #13126 [ci skip] 2020-08-11 10:48:31 -05:00
Lin
aede820e14 Merge pull request #13126 from Detective-Google/t-a-b-l-e 
fixes the random fucking medbay tables that some dipshit left in the hallway on box
 2020-08-11 10:48:28 -05:00
Detective Google
8976bea9a4 someone doesnt know how to fucking map edit 2020-08-11 10:35:52 -05:00
CitadelStationBot
45827bf241 Automatic changelog generation for PR #12808 [ci skip] 2020-08-11 07:17:39 -05:00
silicons
775fa046eb you can now use any typepath as an emoji :/obj/item/clothing/mask/joy: (#12808) 
* Update emoji_parse.dm

* Update emoji_parse.dm
 2020-08-11 14:17:35 +02:00
CitadelStationBot
402732db91 Automatic changelog generation for PR #13011 [ci skip] 2020-08-11 03:47:36 -05:00
silicons
a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch 
adds a cybernetic eyepatch to the syndicate uplink
 2020-08-11 01:47:32 -07:00
CitadelStationBot
e49bf3978e Automatic changelog generation for PR #13071 [ci skip] 2020-08-11 03:45:26 -05:00
silicons
c18b26efe9 Merge pull request #13071 from ancientpower/box-medbay-doors 
Adds doors to the west of box medbay
 2020-08-11 01:45:23 -07:00
CitadelStationBot
b61f64f164 Automatic changelog generation for PR #13070 [ci skip] 2020-08-11 03:44:43 -05:00
silicons
cf209939ea Merge pull request #13070 from kappa-sama/patch-40 
lowers price of 2 borderline useless uplink items
 2020-08-11 01:44:40 -07:00
silicons
b16f920479 Merge pull request #13086 from ArchieBeepBoop/dev 
Add Skulldog Snout
 2020-08-11 01:44:29 -07:00
CitadelStationBot
c5ff609021 Automatic changelog generation for PR #13107 [ci skip] 2020-08-11 03:44:11 -05:00
silicons
e7d7b991d9 Merge pull request #13107 from DeltaFire15/warcrime-gun-armory-lock 
The warcrime gun belongs in the armory
 2020-08-11 01:44:07 -07:00
CitadelStationBot
46528a0e92 Automatic changelog generation for PR #13106 [ci skip] 2020-08-11 03:43:58 -05:00
silicons
2d01c4db5b Merge pull request #13106 from zeroisthebiggay/cesuitgoclick 
ce hardsuit no longer requires a jumpsuit to actually be fully radproof
 2020-08-11 01:43:54 -07:00
silicons
16a556b367 Merge pull request #13101 from Detective-Google/funny 
spelling
 2020-08-11 01:43:35 -07:00
CitadelStationBot
b7181d7cc2 Automatic changelog generation for PR #13089 [ci skip] 2020-08-11 03:43:24 -05:00
silicons
df05c5ee4d Merge pull request #13089 from Putnam3145/fix-sprite-display 
Demodularization + making certain sprite overlays less hilariously jank
 2020-08-11 01:43:21 -07:00
silicons
c1d8d1d439 Merge pull request #13090 from lolzalolka/lean 
Added Burek to Space
 2020-08-11 01:42:58 -07:00
CitadelStationBot
6d6b91e6df Automatic changelog generation for PR #13095 [ci skip] 2020-08-11 03:41:51 -05:00
silicons
5694923d89 Merge pull request #13095 from lolman360/liver 
custom name/desc ring and necklace
 2020-08-11 01:41:48 -07:00
CitadelStationBot
37ee9f1c3c Automatic changelog generation for PR #13098 [ci skip] 2020-08-11 03:41:29 -05:00
silicons
035422ed7f Merge pull request #13098 from LetterN/ToS-component 
Mafia Component
 2020-08-11 01:41:13 -07:00
silicons
82824f9fb9 Merge pull request #13100 from lolzalolka/lean2 
Suture/Mesh Crafting (take2)
 2020-08-11 01:40:50 -07:00
CitadelStationBot
051ef9df87 Automatic changelog generation for PR #13120 [ci skip] 2020-08-11 03:40:37 -05:00
silicons
abf5d7070e Merge pull request #13120 from LetterN/nyanite-fix-1 
Fixes missing icon and handtele being fast
 2020-08-11 01:40:34 -07:00
lolman360
49948e77a4 SELLYOULOSE 2020-08-11 18:08:40 +10:00
Letter N
ab7c560f6d revert 2020-08-11 16:04:18 +08:00
lolman360
f10053fe96 suture 2020-08-11 18:03:59 +10:00
Letter N
5845684a04 icongone 2020-08-11 15:56:27 +08:00
lolman360
c699729250 lint 2020-08-11 17:53:51 +10:00
lolman360
740b4f3ecf WHOOPS 2020-08-11 17:50:30 +10:00
lolman360
6ec9a3c4bd craftable plunger 2020-08-11 17:38:16 +10:00