shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

12930 Commits

Author SHA1 Message Date
r4d6
8b68e57de0 Add the pickaxes 2020-02-10 22:02:39 -05:00
keronshb
42fda3d88b CogChamp 
Adds the CogChamp drink!  Bloodcult gets one so why not Clock?
 2020-02-10 21:18:51 -05:00
Lin
f1f8123e5a Merge pull request #10989 from Citadel-Station-13/Ghommie-patch-5 
CallMaterialName reagent fix
 2020-02-10 20:27:38 +00:00
Lin
4f546c90e3 Merge pull request #10982 from Ghommie/Ghommie-cit566 
something about suit_digi.dmi
 2020-02-10 20:24:35 +00:00
r4d6
dccbb49626 Fixes 2020-02-10 11:59:14 -05:00
Artur
8e50c278bb Rebuild and misc nuke tweak 2020-02-10 17:34:14 +01:00
Artur
af95921155 Goddamnit 2020-02-10 15:20:22 +01:00
kevinz000
520dd57bf9 Update mob_helpers.dm 2020-02-10 04:33:27 -07:00
kevinz000
276f4b5fae Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters 2020-02-10 04:32:01 -07:00
kevinz000
690c14a716 Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters 2020-02-10 04:29:22 -07:00
kevinz000
d406086258 Update gravity.dm 2020-02-10 04:26:26 -07:00
Ghom
c8a62e7acf Merge pull request #10985 from r4d6/Dwarf 
Dwarven Update
 2020-02-10 12:23:23 +01:00
Ghom
3ee4f25626 Merge pull request #11001 from Arturlang/P.A.N.D.E.M.I.C_fixes 
Pandemic Fixes
 2020-02-10 12:22:40 +01:00
Ghom
a0666e7454 Merge pull request #11000 from Seris02/rcdfixyeet 
makes RCDs not cost a single sheet of glass and metal
 2020-02-10 12:20:40 +01:00
kevinz000
3a655d71d4 fix 2020-02-10 04:19:52 -07:00
kevinz000
01390fa0e0 Merge remote-tracking branch 'citadel/master' into attack_chain 2020-02-10 04:18:02 -07:00
kevinz000
c29e0e1a1d Merge pull request #10596 from Seris02/hijackbackup 
Hijack Implant
 2020-02-10 04:16:14 -07:00
kevinz000
79146bce9b Merge pull request #10967 from Citadel-Station-13/Ghommie-patch-3 
Fixes AI unanchoring not properly removing the no teleport trait.
 2020-02-10 04:15:29 -07:00
kevinz000
c9e5fd1c17 Merge pull request #10988 from YakumoChen/master 
Reverts 10486 (Observe verb in the Ghost tab)
 2020-02-10 04:14:33 -07:00
kevinz000
0b28e17860 Update gravity.dm 2020-02-10 04:13:59 -07:00
kevinz000
c3eaa0fcbd Merge pull request #10948 from Citadel-Station-13/Ghommie-patch-1 
Prevents certain unpurchasable discounts.
 2020-02-10 04:11:35 -07:00
kevinz000
88fa342c26 Merge pull request #10976 from Ghommie/Ghommie-cit565 
fixing another issue with the hear component signal.
 2020-02-10 04:09:19 -07:00
kevinz000
45bec21520 fix sync 2020-02-10 04:01:21 -07:00
BlackMajor
d778273083 Make ash walkers a static spawn 2020-02-10 21:46:03 +13:00
Artur
816f94bd61 pandemic fixes 2020-02-10 10:20:57 +02:00
Seris02
e6aa47997c fix rcd cost 2020-02-10 16:00:21 +08:00
Ghom
0d37700836 Merge pull request #10926 from keronshb/PirateBombProof 
Buffs the Pirate Ship to be bomb resistant
 2020-02-10 08:40:10 +01:00
Ghommie
c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
Winter Flare
e11c8c3647 Fixing a moneymaking oversight. 2020-02-10 00:35:31 -05:00
Winter Flare
bb641fecf8 Sprites, Tweaks, and Snacks 
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.

Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
 2020-02-09 23:07:32 -05:00
Ghommie
d4c74c19de Something about cryopods. 2020-02-10 04:26:50 +01:00
Linzolle
63be3300d2 actually 2020-02-09 19:52:44 -06:00
DeltaFire
55a5686c01 No more Narsie runes in half the time or less 
Why exactly are we allowing cultists to write nar nar with half the time on runed floors? So thats why people are always too late...
 2020-02-10 02:46:54 +01:00
Linzolle
4622f66162 for real this time 2020-02-09 19:45:22 -06:00
Hatterhat
d24afcde1b pb burst from 60 to 81 2020-02-09 19:07:24 -06:00
Ghom
33688dbe93 Merge pull request #10981 from IHOPMommyLich/AdrenalsChange 
Nerfing Stimulants
 2020-02-09 23:56:52 +01:00
Ghom
3a2eb8c1ad Update experimental_dissection.dm 2020-02-09 22:50:43 +01:00
Ghom
c7614958bc Merge pull request #10937 from Arturlang/debug_outfit_updates 
Updates the debug outfit
 2020-02-09 22:49:22 +01:00
Ghom
0f2f5ab639 Merge pull request #10936 from Citadel-Station-13/kevinz000-patch-7 
Cyborging someone will now be able to force-remove gang lead status, much like how it can force-deantag headrevs and bloodsuckers
 2020-02-09 21:38:50 +01:00
Ghom
101640170b Merge pull request #10954 from Citadel-Station-13/kevinz000-patch-9 
repulse sanity
 2020-02-09 21:09:00 +01:00
Arturlang
29207b22fb Merge branch 'master' into debug_outfit_updates 2020-02-09 22:05:26 +02:00
r4d6
e4f2af2d77 compile 2020-02-09 07:34:21 -05:00
r4d6
9ba0a1b470 Code update 2020-02-09 07:21:47 -05:00
Ghom
bcbaea4a7b CallMaterialName reagent fix 2020-02-09 10:46:29 +01:00
YakumoChen
1c24797de1 revert 10486 2020-02-09 06:41:13 +00:00
Ghommie
f6adce72fb Something about missing private sprites and their bad code. 2020-02-09 06:51:57 +01:00
r4d6
e6398815b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarf 2020-02-08 23:23:28 -05:00
kevinz000
3264596bac Merge pull request #10930 from r4d6/meteor-alt-2 
Put the meteor timer to 3-5 minutes
 2020-02-08 21:12:38 -07:00
r4d6
49f2993c59 Correct timer 2020-02-08 23:09:51 -05:00
r4d6
5316cc3665 Make dwarves not have an accent when speaking dwarvish 2020-02-08 23:02:32 -05:00