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

4128 Commits

Author SHA1 Message Date
Ghom
0619521418 Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4 
Corrects a few cargo crates/exports (and nerfs some)
 2020-02-19 02:10:25 +01:00
Ghom
2b7f27270f Merge pull request #11083 from Hatterhat/sword-cleaning 
purifying longswords - alt title "there's no way this should have worked"
 2020-02-18 19:02:34 +01:00
Ghom
08c86ec1ea Merge pull request #11091 from BlueWildrose/master 
Podpeople species tail wag fix; also lifebringer name fix
 2020-02-18 17:11:50 +01:00
kevinz000
ed36aae74b Merge pull request #11112 from necromanceranne/mech-revival 
Mech Stuff: Ports /tg/ pr #44529, reverts #9092 (mostly)
 2020-02-18 02:18:57 -07:00
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
Ghom
5c60994572 Merge pull request #11108 from Seris02/hslshit 
makes spraycans rely on HSL lightness instead of an addition of all the RGB values
 2020-02-17 13:45:23 +01:00
kevinz000
cdf358b97e Merge pull request #11101 from Ghommie/Ghommie-cit581 
Porting (admin-only) pair pinpointers and fixing an edge case runtime.
 2020-02-16 16:08:11 -07:00
kevinz000
379c914099 Merge pull request #10704 from Ghommie/Ghommie-cit529 
More Runtimenator fixes.
 2020-02-16 05:10:19 -07:00
necromanceranne
5c2e244ee0 Ports /tg/ pr #44529, reverts #9092 2020-02-16 22:20:50 +11:00
Seris02
788a9f5b59 WOOPS 2020-02-16 16:39:35 +08:00
Hatterhat
b60b0a95aa you ever just forget that if statements exist 2020-02-16 02:28:12 -06:00
kevinz000
14fdd90618 Nerfs public autolathes (#10970) 2020-02-16 07:37:24 +01:00
Seris02
fb4e4bcfce makes spraycans rely on HSL lightness instead of an addition of all the RGB values 2020-02-16 12:05:38 +08:00
Hatterhat
0f5ea361e7 bada bing bada boom 2020-02-15 14:07:35 -06:00
Hatterhat
c9af8dc713 perhaps 2020-02-15 14:05:27 -06:00
kevinz000
7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569 
Something about the in operator and spaceDMM version update.
 2020-02-15 12:17:37 -07:00
kevinz000
b9e8be5784 Merge pull request #10940 from Ghommie/Ghommie-cit560 
First tweak to cargo reagents selling.
 2020-02-15 12:15:50 -07:00
kevinz000
eb33901046 Merge pull request #11002 from BlackMajor/walkerbois 
Makes the Ash Walker camp a static spawn in lavaland.
 2020-02-15 11:47:58 -07:00
kevinz000
957c6168b6 Merge pull request #11006 from Ghommie/Ghommie-cit570 
Something about a couple stack trace issues.
 2020-02-15 11:47:30 -07:00
kevinz000
d2398f4584 Merge pull request #11075 from Citadel-Station-13/Ghommie-patch-2 
Porting agent card updates and registered name fix.
 2020-02-15 11:45:39 -07:00
Ghommie
72efdec3fb Porting pair pinpointers and fixing an edge case runtime. 2020-02-15 19:12:07 +01:00
Hatterhat
5a9208bc42 shit whoops 2020-02-14 16:29:17 -06:00
Hatterhat
3b873d4000 thanks ghommie 2020-02-14 16:28:39 -06:00
Ghommie
4a621fb1aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560 2020-02-14 19:39:53 +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
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
Hatterhat
b2e3243760 there's no way this should have worked 2020-02-13 21:32:27 -06:00
Ghom
071c3a143f Update cards_ids.dm 2020-02-13 18:13:14 +01:00
Ghom
1628934b9f Update cards_ids.dm 2020-02-13 18:00: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
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
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
Winter Flare
5549cd93f1 Merge branch 'master' into tinytweaks-2-9-20 2020-02-11 07:20:16 -05:00
Ghommie
c19549c7f9 Something about a couple stack trace issues. 2020-02-10 14:51:05 +01: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