shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,734 Commits 5 Branches 0 Tags
bcf77458dd5639ba27f07dd4acb0a174aa562dbb
Commit Graph

21280 Commits

Author SHA1 Message Date
Ghom
0400fbf8a2 Update constructs.dm 2020-03-09 22:21:32 +01:00
Ghommie
0587d3482d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604 2020-03-09 21:53:22 +01:00
Trilbyspaceclone
8e030763b6 Odd but ok? 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-09 12:38:45 -04:00
Ghom
29346f7827 Merge pull request #11371 from keronshb/BlobRefactor 
Blob refactor + reroll ports
 2020-03-09 17:07:45 +01:00
Ghom
503827a0b6 Merge pull request #11382 from zeroisthebiggay/snowflakesyndicatecontractorshit 
tauric contractor space suits
 2020-03-09 16:50:32 +01:00
Ghom
ea556e6357 [s] Ports "Fixes gibber part update" 2020-03-09 16:41:56 +01:00
Ghommie
4143c1963c Porting more legcuffs / bola fixes etcetera 2020-03-09 16:20:51 +01:00
TrilbySpaceClone
4968c22b5f sprites! 2020-03-09 08:47:56 -04:00
Seris02
067e2e4506 probably fixes hulk 2020-03-09 18:15:12 +08:00
Seris02
68382d65c8 normalising wagging tail names 2020-03-09 17:48:12 +08:00
Seris02
cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Seris02
9b66940807 fixes the web 2020-03-09 16:27:46 +08:00
kevinz000
3da09077ec Merge pull request #11393 from Citadel-Station-13/Ghommie-patch-1 
Webedit fixing bloodsucker mesmerize
 2020-03-08 21:29:10 -07:00
kevinz000
d7c5b87263 Update action.dm 2020-03-08 21:24:52 -07:00
ZeroMan
c079dba753 its a fucking helmet 2020-03-08 23:07:24 -04:00
Ghommie
ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
keronshb
7e1e905a95 Line ending changes, I hope 
here goes nothing.
 2020-03-08 20:36:05 -04:00
Ghom
f1d6360b70 Shuttle timer display seconds fix 2020-03-09 01:31:39 +01:00
keronshb
0d3da4fcc0 maybe? last go? 2 
Should be the final part I hope
 2020-03-08 20:11:13 -04:00
keronshb
94958581b9 maybe? last go? 
maybe? last go?
 2020-03-08 20:10:34 -04:00
Ghom
f8c18fe5a8 Update PDA.dm 2020-03-09 00:52:11 +01:00
keronshb
fd1dc991ce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor 
Pne more test go
 2020-03-08 19:48:30 -04:00
Ghom
1c5aa2f933 Merge pull request #11377 from Kraseo/contractor-fixes 
Some contractor adjustments & fixes
 2020-03-09 00:26:54 +01:00
Ghom
8878733fc1 Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI 
Ports Skyrat's synths (Plus limb rendering overhaul and more)
 2020-03-09 00:26:06 +01:00
keronshb
7955ca4f8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor 
Trying to fix this shit again
 2020-03-08 19:17:28 -04:00
Ghom
1cd9c19b4c Merge pull request #11288 from Trilbyspaceclone/patch-300 
[ready] Craftable Prescription & Sunglasses HUDs
 2020-03-09 00:01:12 +01:00
keronshb
d460f5359e Hopefully this will fix it? 
Hopefully this will fix it?
 2020-03-08 18:49:18 -04:00
keronshb
9b63c7aa11 Trying to see if this will fix the line end issue 
Trying to see if this will fix the line end issue
 2020-03-08 18:48:42 -04:00
Ghom
bceed5d002 Update recipes_clothing.dm 2020-03-08 23:46:33 +01:00
Ghom
187de6869f Webedit fixing bloodsucker mesmerize 2020-03-08 23:38:30 +01:00
ZeroMan
388891bde3 fianlly ive discovered obanium 2020-03-08 18:31:12 -04:00
Ghommie
59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
keronshb
0f14fbfdac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor 
To fixs something?
 2020-03-08 17:51:17 -04:00
Putnam
eacdc3b438 Let gorlex marauders contract, and made them hijack 2x as fast as other traitors 2020-03-08 14:05:04 -07:00
ZeroMan
1941169582 will this fucking work 2020-03-08 15:45:35 -04:00
Winter Flare
bb9066e9cb Food Additions / Butter Bear 
Ports the following from TG:
Chicken Nugget Box
Crab Burger, Bisque, French Onion Soup, Crab Rangoo
Butter Bear aka Terrygold

Tweaks Bisque and Crab Rangoo recipie.
Removes Bacon from Exotic Meat crate.
Adds Spider Eggs to Exotic Meat crate.
 2020-03-08 14:36:08 -04:00
Ghommie
ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
kevinz000
274b9c28b3 Merge pull request #11264 from Ghommie/Ghommie-cit592 
fixing a couple silicon privileges runtimes. Also .dme alphabetic order
 2020-03-08 11:10:30 -07:00
kevinz000
b2235e03a7 Merge pull request #11372 from Ghommie/Ghommie-cit610 
Of runtimes and null.
 2020-03-08 11:10:02 -07:00
kevinz000
5add119388 Merge pull request #11374 from Detective-Google/AI-cryo 
Adds a verb for AIs to cryo
 2020-03-08 11:09:48 -07:00
kevinz000
2b99f729e6 Merge pull request #11384 from Citadel-Station-13/Ghommie-patch-3 
I forgot to delete a line on the (now working) PDA overlays fix.
 2020-03-08 11:09:17 -07:00
kevinz000
2b5f337f06 Merge pull request #11365 from Ghommie/Ghommie-cit607 
Makes monkey probability of gorillize from radiation exponential.
 2020-03-08 08:15:11 -07:00
kevinz000
36f1e952b4 Merge pull request #11357 from Ghommie/Ghommie-cit606 
Patches some awful integrated circuit examiner runtime errors.
 2020-03-08 08:14:58 -07:00
Ghom
3c066aa771 Update pai_shell.dm 2020-03-08 15:46:38 +01:00
kevinz000
c736568a5a Merge pull request #11369 from Ghommie/Ghommie-cit609 
Porting the musician and curator beacons.
 2020-03-08 07:34:48 -07:00
Ghom
7ad2c6dce0 Update pai.dm 2020-03-08 14:55:15 +01:00
Ghom
8f6677326d Update pai.dm 2020-03-08 14:51:41 +01:00
Ghom
a0e5f1651e Update pai_shell.dm 2020-03-08 14:49:43 +01:00
Ghom
4a61dc7b72 tgstation PR #48189 by Yenwodyah 2020-03-08 14:10:34 +01:00
Ghom
57ba56d3bc Update handcuffs.dm 2020-03-08 14:09:59 +01:00