shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,915 Commits 5 Branches 0 Tags
bb641fecf8bcc3ca96d268f5acca82fef7186180
Commit Graph

6821 Commits

Author SHA1 Message Date
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
Ghom
1dfba9f416 Merge pull request #10957 from Putnam3145/fix-occasional-dynamic-runtime 
Fixes a spurious dynamic runtime if nobody votes
 2020-02-07 22:41:48 +01:00
Lin
5717700146 Merge pull request #10925 from Ghommie/Ghommie-cit558 
runtime is forever, errors are eternal.
 2020-02-07 17:29:49 +00:00
Putnam
b4faac50a9 yeah "null" is bad juju. why did i do that 2020-02-07 04:41:16 -08:00
kevinz000
4e2e411dd0 Merge pull request #10929 from Ghommie/Ghommie-cit559 
Double-esword and hypereuplastic blade toys are now blunt.
 2020-02-06 23:51:17 -07:00
Ghom
cee2410091 Merge pull request #10922 from Citadel-Station-13/kevinz000-patch-5 
renames the lawyer cartridge to something more accurate to its function
 2020-02-07 05:53:09 +01:00
kevinz000
62b0e62952 Merge pull request #10623 from Putnam3145/antag-overhaul 
Better antag objectives: for real this time
 2020-02-06 16:25:22 -07:00
Ghom
ce6b37da1e Merge pull request #10920 from Arturlang/debbuging 
Adds vscode debbuging
 2020-02-06 20:33:21 +01:00
Arturlang
0353f1602d Fixes ore boxes 2020-02-06 20:10:02 +01:00
kevinz000
75d3a8b35d Merge pull request #10868 from Citadel-Station-13/Ghommie-patch-4 
Holofans visual tweak.
 2020-02-06 00:42:39 -07:00
kevinz000
3c5a3cb4d4 Merge pull request #10883 from ancientpower/ghost-newscasters 
Allows ghosts to read newscasters and books
 2020-02-05 23:46:04 -07:00
kevinz000
e0dd12ecbd Merge pull request #10902 from Citadel-Station-13/Ghommie-patch-1 
Fixes some mounted defibrillator issue.
 2020-02-05 23:45:45 -07:00
kevinz000
50cabc3c64 Merge pull request #10889 from Ghommie/Ghommie-cit555 
runtime drifting
 2020-02-05 23:44:52 -07:00
kevinz000
d0cd33a5ea Merge pull request #10899 from Trilbyspaceclone/vender-hate 
Almost all venders now can be restocked
 2020-02-05 23:44:30 -07:00
Ghommie
8131a60f3a Oh. 2020-02-06 02:10:03 +01:00
Ghommie
523e080f87 Double-esword and hypereuplastic blade toys are sharp now blunt. 2020-02-06 02:09:27 +01:00
Ghommie
a3e2ec372f Makes it compile also custom emote fix. 2020-02-06 01:40:14 +01:00
Ghommie
233ed5873f race conditions and turfs beings special. 2020-02-06 01:13:28 +01:00
Ghommie
ab06c23a2b runtime is forever, errors are eternal. 2020-02-05 23:48:17 +01:00
kevinz000
98c721fffc Update cart.dm 2020-02-05 13:29:31 -07:00
Artur
c2b68d0ba3 Adds debbuging 2020-02-05 20:35:24 +01:00
Tupinambis
3539fa7603 Stunbaton PR had bad math didn't properly reduce effectiveness oops. 2020-02-05 00:31:54 -06:00
Ghom
77eb7b8a96 Merge pull request #10812 from Tupinambis/StunbatonFUNCTIONAL 
Stunbaton Balance Adjustments 2.0 (Unfucked Edition)
 2020-02-05 07:02:11 +01:00
Ghom
472bddb5be Merge pull request #10869 from kevinz000/WHY 
can we talk about how admin attack logs being viewable in game is not a good thing, alternatively "i want a word with whoever coded mech logging"
 2020-02-05 06:52:20 +01:00
Ghom
ee2ab7c9f0 Update defibrillator_mount.dm 2020-02-04 23:51:55 +01:00
Ghom
3cd6cfb7d5 Update defibrillator_mount.dm 2020-02-04 23:50:33 +01:00
TrilbySpaceClone
06fd6645b3 And it wokrs 2020-02-04 16:01:22 -05:00
Lin
66638a39b7 Merge pull request #10851 from Citadel-Station-13/Ghommie-patch-3 
Fixing little blood bank gnerator examine runtime error.
 2020-02-04 20:36:28 +00:00
kevinz000
13df3dbb05 Merge pull request #10867 from Ghommie/Ghommie-cit551 
Further buff and fix to the clown ops' tearstache grenade.
 2020-02-04 03:55:22 -07:00
kevinz000
275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547 
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
 2020-02-04 03:39:14 -07:00
kevinz000
66fc2e77f0 Merge pull request #10865 from Ghommie/Ghommie-cit550 
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
 2020-02-04 03:35:33 -07:00
kevinz000
f5cd0cf48f Merge pull request #10872 from Arturlang/reflective_ornot 
Makes shield no longer block energy projectiles and be destroyed when damaged too much.
 2020-02-04 03:34:16 -07:00
kevinz000
b34d6cba0c Merge pull request #10864 from Citadel-Station-13/Ghommie-patch-1 
Hello subtler roleplayers, I see you.
 2020-02-04 03:33:14 -07:00
kevinz000
8f83e8c107 Merge pull request #10860 from deathride58/combatmodeclickdrag 
Makes quick item usage (click-dragging unequipped item) require combat mode
 2020-02-04 03:32:39 -07:00
kevinz000
97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549 
A PR about runtime errors
 2020-02-04 03:20:34 -07:00
Ghommie
a0caada859 runtime drifting 2020-02-04 08:05:27 +01:00
Ghom
6de00c21f0 Update dna_console.dm 2020-02-04 04:11:21 +01:00
ancientpower
5aecdb6a4d initial commit 2020-02-03 20:10:39 -06:00
kevinz000
24b2bb06bf Update mecha_equipment.dm 2020-02-03 13:17:50 -07:00
Ghom
5df6566f01 Update clown_weapons.dm 2020-02-03 20:44:58 +01:00
Putnam
88ce25a09b hopefully fixing the once-assassin 2020-02-03 08:10:45 -08:00
Putnam
52432ed0a7 too many dynamic changes for my sanity 2020-02-03 07:12:27 -08:00
Putnam
53cad493a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul 2020-02-03 03:17:23 -08:00
Artur
5bf1ebaa53 Initial Commit 2020-02-03 12:01:17 +01:00
kevinz000
9a1974e3b6 Update mecha.dm 2020-02-03 00:50:57 -07:00
kevinz000
0a6e304ac2 s 2020-02-03 00:47:51 -07:00
Ghom
ccd557122c Update holosign.dm 2020-02-03 08:35:47 +01:00
Ghom
f2fd48bfd9 Update holosign.dm 2020-02-03 08:31:12 +01:00
Ghom
d5166322dc I can't believe I have done this. 2020-02-03 08:23:20 +01:00
Ghommie
84d9430ee4 PC too slow for compile. 2020-02-03 07:21:39 +01:00