Commit Graph

19666 Commits

Author SHA1 Message Date
kevinz000
58db43621d Merge pull request #10941 from Ghommie/Ghommie-cit561
Adds the ELEMENT_DETACH flag to two elements
2020-02-11 00:42:15 -07:00
Winter Flare
082085f143 Poppy Muffin (Fug You Derk) 2020-02-10 23:09:36 -05:00
Hatterhat
1d071ff127 one off 2020-02-10 21:40:51 -06:00
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
4797b5edc8 Merge pull request #10961 from Citadel-Station-13/Ghommie-patch-2-1
Fixes an issue with the nearsighted prescription glasses taking over worn eyewear
2020-02-10 20:28:57 +00: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
Ghommie
c19549c7f9 Something about a couple stack trace issues. 2020-02-10 14:51:05 +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
32a5957c18 usr 2020-02-10 04:30:07 -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
5d2b2d7fbf Merge pull request #10971 from Trilbyspaceclone/disco_baby
Adds more Alien disco
2020-02-10 04:14:18 -07:00
kevinz000
0b28e17860 Update gravity.dm 2020-02-10 04:13:59 -07:00
kevinz000
4416d9de46 Merge pull request #10965 from Citadel-Station-13/Ghommie-patch-2
Fixing the mob holder element
2020-02-10 04:11:51 -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
Ghom
bd5f2bd64d Update reinf_walls.dm 2020-02-10 07:41:36 +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
keronshb
023d49a207 30 removal
Here it is
2020-02-09 23:44:34 -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
Ghom
96a240bc11 Merge pull request #10984 from Trilbyspaceclone/patch-277
Makes heads of staff no longer come to work as a gang leader
2020-02-10 03:51:49 +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
Linzolle
c5bbce0928 add the BOW 2020-02-09 18:36:36 -06:00
keronshb
1492586f76 Fixes round 3? 4?
Should fix the last round of requests?
2020-02-09 18:18:55 -05:00
Ghom
33688dbe93 Merge pull request #10981 from IHOPMommyLich/AdrenalsChange
Nerfing Stimulants
2020-02-09 23:56:52 +01:00
keronshb
60a3b134a3 Should fix the rest of the requested changes
Title
2020-02-09 17:30:22 -05:00