Arturlang
796f51b557
Merge branch 'master' into TGUI_Next_Nanites
2020-02-20 00:52:55 +02:00
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
c79ecf4db7
So no mech logging, huh?
2020-02-16 22:56:10 +11:00
necromanceranne
98d33544d8
I forgot the melon shot
2020-02-16 22:39:47 +11: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
Hatterhat
40f7069480
tgstation 42495 - the one that makes more mechs take stock parts ( #11011 )
...
* i think i got everything
* so how about that one comma
2020-02-16 07:48:22 +01: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
36cebc733c
Merge pull request #11039 from Ghommie/Ghommie-cit572
...
Something about a couple runtimes.
2020-02-15 12:19:50 -07: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
ee9b38017e
Merge pull request #10995 from Ghommie/Ghommie-cit568
...
Something about cryopods.
2020-02-15 12:17:02 -07:00
kevinz000
f79148d549
Merge pull request #10947 from Ghommie/Ghommie-cit563
...
Holopad static fix and a few other mistakes.
2020-02-15 12:16:23 -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
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
Hatterhat
5a9208bc42
shit whoops
2020-02-14 16:29:17 -06:00
Hatterhat
3b873d4000
thanks ghommie
2020-02-14 16:28:39 -06:00
Ghom
0a1c3bd084
Merge branch 'master' into Ghommie-cit539
2020-02-14 19:42:36 +01: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
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
Hatterhat
b2e3243760
there's no way this should have worked
2020-02-13 21:32:27 -06: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
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
Artur
c01f78b8e8
Conflict fix
2020-02-13 17:52:28 +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
