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

4085 Commits

Author SHA1 Message Date
BlueWildrose
cfca197fbb forgot one last change that I made out of frustration because making things bald wasn't working for some reason 2020-02-17 19:55:32 -07:00
BlueWildrose
930e6f9876 Requested changes, ghost_role_spawner.dm 2020-02-17 19:47:48 -07:00
Blue Wildrose
d45a20c19b Podpeople tweaks 
- Podpeople can wag tails now
- Moved a few features into the podperson race itself instead of its weaker, roundstart variant; this in theory, will allow pod-grown hydroponics podpeople to have hair now, as well as all those anthropomorphic features, should they be revived through this method.
- Fixed the lifebringers having no name somehow but... currently lifebringers under this change will turn them into animal anthropomorphic hairy mutants of some kind until I figure out how to make them the bald podpeople that they once were, could use some help with this.
 2020-02-14 05:12:50 -07:00
Ghom
64882b8a90 Merge pull request #10993 from Linzolle/bows 
adds the bow
 2020-02-14 08:01:12 +01:00
Ghom
121b37410a Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20 
Sprites, Tweaks, and Snacks, QoL
 2020-02-13 16:40:12 +01:00
Ghom
5730b717c5 Merge pull request #10969 from Seris02/crowbarcrate 
allows you to wirecutters the manifests off crates without opening them
 2020-02-13 09:41:10 +01:00
Ghom
b3a530abc9 Merge pull request #11027 from ShadeAware/capsdrobe2 
Captain's Locker De-bloat, plus the Captain's Wardrobe (NOW WITH NO MERGE CONFLICTS)!
 2020-02-13 09:40:22 +01:00
Ghom
bfdef7fcfd Merge pull request #10755 from kevinz000/attack_chain 
small refactor to melee_attack_chain
 2020-02-13 09:39:07 +01:00
Winter Flare
ac55d1d25d Merge branch 'master' into tinytweaks-2-9-20 2020-02-13 03:34:44 -05:00
kevinz000
40111faab1 Update geiger_counter.dm 2020-02-13 00:12:25 -07:00
Seris02
4ac7fff7e3 ye 2020-02-13 13:37:47 +08:00
ShadeAware
bbedf617f5 Declutters the Locker 2020-02-11 17:33:18 -05:00
Winter Flare
5549cd93f1 Merge branch 'master' into tinytweaks-2-9-20 2020-02-11 07:20:16 -05: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
5d2b2d7fbf Merge pull request #10971 from Trilbyspaceclone/disco_baby 
Adds more Alien disco
 2020-02-10 04:14:18 -07: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
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
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
keronshb
60a3b134a3 Should fix the rest of the requested changes 
Title
 2020-02-09 17:30:22 -05: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
c2baad44d8 Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit 
ENDS THE PLUSHIE DRAMA
 2020-02-09 21:47:30 +01:00
keronshb
9609eb64e0 Fixes some files and pathings for this 
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
 2020-02-09 15:18:15 -05:00
Arturlang
29207b22fb Merge branch 'master' into debug_outfit_updates 2020-02-09 22:05:26 +02:00
TrilbySpaceClone
30c78c5be2 Let their be lists 2020-02-08 02:37:37 -05:00
Seris02
0b1cb9db6d timer'd 2020-02-08 15:25:11 +08:00
TrilbySpaceClone
76219e0188 Primortial 2020-02-08 02:21:14 -05:00
Seris02
6d8bfd2a38 tru 2020-02-08 14:01:51 +08:00
Seris02
6af421994a yay 2020-02-08 13:53:43 +08: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
Seris02
4ec99a38e2 merge fixes 2020-02-07 15:28:05 +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
Arturlang
0353f1602d Fixes ore boxes 2020-02-06 20:10:02 +01:00
Artur
c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +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
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
233ed5873f race conditions and turfs beings special. 2020-02-06 01:13:28 +01:00
keronshb
5d1d652ea4 Buffs the Pirate Ship to be bomb proof 
Title, also makes a few computers/machines indestructible and buffs turret health.  It also allows turrets to be repairable now.
 2020-02-05 18:28:00 -05: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
Seris02
d0100345fd done hopefully 2020-02-05 17:00:38 +08:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08: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