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

6916 Commits

Author SHA1 Message Date
kevinz000
f6cf5adb4c Update mech_fabricator.dm 2020-02-14 15:33:47 -07:00
kevinz000
d97b1d4e80 Update mech_fabricator.dm 2020-02-14 15:30:06 -07:00
Ghom
0a1c3bd084 Merge branch 'master' into Ghommie-cit539 2020-02-14 19:42:36 +01:00
Ghom
1e57664a99 Merge pull request #10934 from kevinz000/actual_ghost_newscasters 
Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)
 2020-02-14 19:21:48 +01:00
Ghom
e36a581889 Merge pull request #11065 from Citadel-Station-13/kevinz000-patch-17 
removes bluespace dick compression
 2020-02-14 19:21:11 +01:00
Ghom
b9ab0cebb3 Merge pull request #11051 from Citadel-Station-13/kevinz000-patch-2 
nerfs hand teleporters to have a dispel delay
 2020-02-14 19:17:59 +01:00
Ghom
fe332571fd Merge pull request #11061 from Trilbyspaceclone/patch-285 
Massive metal tower shields now are not transparent
 2020-02-14 19:17:04 +01:00
Ghom
64882b8a90 Merge pull request #10993 from Linzolle/bows 
adds the bow
 2020-02-14 08:01:12 +01:00
Ghom
ef7347fc37 Merge pull request #11079 from Arturlang/patch-9 
Makes valentine related antag datums convertable by bloodsuckers
 2020-02-14 07:36:11 +01:00
Arturlang
cf980b52ac Fuck valentines 2020-02-14 00:01:07 +02:00
Artur
7964d768fa Initial Commit 2020-02-13 20:51:52 +02: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
a4a9701c98 Merge pull request #11022 from kevinz000/ssprofiler 
ports auto profiler subsystem from tg
 2020-02-13 15:06:27 +01:00
kevinz000
4345f01322 Merge pull request #11021 from Ghommie/Ghommie-cit571 
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
 2020-02-13 04:11:01 -07:00
kevinz000
d74cfb7734 Update compressionkit.dm 2020-02-13 02:22:25 -07: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
Ghom
721b647e3c Merge pull request #11024 from Citadel-Station-13/kevinz000-patch-5 
Fixes brig cell timers, alternatively "WHO DECIDED TO USE NUMBER OF SECONDS FROM 2000 INSTEAD OF FROM THE CURRENT DAY"
 2020-02-13 09:28:35 +01:00
Trilbyspaceclone
aa12ec70a3 Update shields.dm 2020-02-13 03:02:26 -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
kevinz000
73e782a4de Update teleportation.dm 2020-02-12 20:56:09 -07:00
kevinz000
aad78ffb78 Update teleportation.dm 2020-02-12 17:53:42 -07:00
ShadeAware
bbedf617f5 Declutters the Locker 2020-02-11 17:33:18 -05:00
kevinz000
9459212692 Update brigdoors.dm 2020-02-11 08:51:24 -07:00
kevinz000
cc0b815a5d Update brigdoors.dm 2020-02-11 08:47:32 -07:00
kevinz000
275fb6fc41 auto profiler 2020-02-11 07:54:17 -07:00
Ghommie
0caabe8018 Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM. 2020-02-11 15:23:03 +01:00
Winter Flare
5549cd93f1 Merge branch 'master' into tinytweaks-2-9-20 2020-02-11 07:20:16 -05: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
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
Ghom
bd5f2bd64d Update reinf_walls.dm 2020-02-10 07:41:36 +01: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
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
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
Ghom
506f1199ad I have a bad habit to edit people's (especially trilby) PRs out of the wild. Sorry 2020-02-09 02:56:17 +01:00