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

30449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghom
6ea2843149 Merge pull request #11131 from Seris02/demondabbing 
nerfs bloodcrawl to a cooldown of 0.6 seconds instead of no cooldown
 2020-02-18 17:02:17 +01:00
CitadelStationBot
541ecffa1a Automatic changelog generation for PR #11134 [ci skip] 2020-02-18 08:52:20 -06:00
Ghom
218bb44e3f Merge pull request #11134 from Hatterhat/tg-46579-also-icons 
icons for mechs taking stock parts
 2020-02-18 15:52:17 +01:00
CitadelStationBot
1c156996f4 Automatic changelog generation for PR #11082 [ci skip] 2020-02-18 03:21:39 -06:00
kevinz000
d04126226b Merge pull request #11082 from Hatterhat/preservahyde 
preservahyde, alt title "what if i didnt die from having shit rng and a single epipen"
 2020-02-18 02:21:37 -07:00
CitadelStationBot
47adcaa5c5 Automatic changelog generation for PR #11087 [ci skip] 2020-02-18 03:21:19 -06:00
kevinz000
9280e25703 Merge pull request #11087 from Ghommie/Ghommie-cit579 
Fix for solar panels/trackers being wonky.
 2020-02-18 02:21:16 -07:00
CitadelStationBot
a221280ab5 Automatic changelog generation for PR #11112 [ci skip] 2020-02-18 03:19:00 -06: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
CitadelStationBot
97462c6ffb Automatic changelog generation for PR #11111 [ci skip] 2020-02-18 03:18:06 -06:00
kevinz000
c1df5d5313 Merge pull request #11111 from Ghommie/Ghommie-cit582 
Virology support for synthetic blood and some blood subtypes removal.
 2020-02-18 02:18:03 -07:00
kevinz000
918618831c Merge pull request #11109 from Citadel-Station-13/Ghommie-patch-3 
Something about gibs and mob biotypes.
 2020-02-18 02:17:32 -07:00
CitadelStationBot
1cf45e4315 Automatic changelog generation for PR #11104 [ci skip] 2020-02-18 03:13:55 -06:00
kevinz000
84633e7fe4 Merge pull request #11104 from Trilbyspaceclone/patch-288 
Maybe makes Express console log their buying habits
 2020-02-18 02:13:53 -07:00
CitadelStationBot
be45f89d8e Automatic changelog generation for PR #11119 [ci skip] 2020-02-18 03:12:54 -06:00
kevinz000
43b9875bbd Merge pull request #11119 from Ghommie/Ghommie-cit584 
Something about consistency and magnetic rifles.
 2020-02-18 02:12:51 -07:00
Hatterhat
cc685b813c ignore the branch name i just needed icons 2020-02-17 14:35:37 -06:00
CitadelStationBot
991f04877a Automatic changelog generation for PR #11114 [ci skip] 2020-02-17 09:17:30 -06:00
Ghom
b9b7e27bcb Merge pull request #11114 from Psody-Mordheim/Plzgibsynthflesh 
Revenge Of Synthflesh : Electric Boogalo Part 2
 2020-02-17 16:17:27 +01:00
Seris02
217661184d nerf'd 2020-02-17 21:29:34 +08:00
Ghom
a2583f5f7f Update expressconsole.dm 2020-02-17 14:25:50 +01:00
CitadelStationBot
5b7c376893 Automatic changelog generation for PR #11108 [ci skip] 2020-02-17 06:45:25 -06: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
CitadelStationBot
7a1eec5622 Automatic changelog generation for PR #11053 [ci skip] 2020-02-17 06:29:54 -06:00
Ghom
ffe1c794eb Changes cult stunhand when halos are out (#11053) 
* Changes cult stunhand when halos are out

Turns the stunhand into a burn + knockback hand.  So it remains more defensive than offensive.

* Changes the desc a little

Changes it to "When the cult ascends, so does the spell, it burns and throws back the victim"  Thanks Justin!

* Requested changes

Requested changes
 2020-02-17 13:29:51 +01:00
CitadelStationBot
de75d75519 Automatic changelog generation for PR #11090 [ci skip] 2020-02-17 05:47:22 -06:00
Seris02
b271096b77 rest key, v, version two (#11090) 
* maybe

* skreeeee

* yes

* fucccccccccck

* happy now

* Update interface.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-17 12:47:19 +01:00
Putnam3145
55070f7655 Merge pull request #11125 from Citadel-Station-13/Ghommie-patch-2 
Something about box engine.
 2020-02-16 16:28:43 -08:00
Ghom
66d5e0e346 Update station.dm 2020-02-17 01:03:29 +01:00
CitadelStationBot
0f12540748 Automatic changelog generation for PR #11101 [ci skip] 2020-02-16 17:08:13 -06: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
CitadelStationBot
688dcaf54e Automatic changelog generation for PR #11060 [ci skip] 2020-02-16 13:20:59 -06:00
Lin
794aeb81c2 Merge pull request #11060 from kevinz000/stuff 
guns and cult blood magic now respect stamina softcrit
 2020-02-16 13:20:56 -06:00
CitadelStationBot
d9e9714038 Automatic changelog generation for PR #11120 [ci skip] 2020-02-16 13:05:53 -06:00
Lin
544c7188c3 Merge pull request #11120 from Citadel-Station-13/Ghommie-patch-2 
Fixing sprint buffer cost and regen being rounded down.
 2020-02-16 13:05:50 -06:00
CitadelStationBot
63921b7c8b Automatic changelog generation for PR #11093 [ci skip] 2020-02-16 12:36:44 -06:00
Lin
a37e1ab129 Merge pull request #11093 from Ghommie/Ghommie-cit580 
Something about blood and species handle_chemicals()
 2020-02-16 12:36:41 -06:00
Ghom
32487a95a3 Fixing sprint buffer cost and regen being rounded down. 2020-02-16 19:23:41 +01:00
Ghommie
e1eb781d4b ffs 2020-02-16 18:56:57 +01:00
Ghommie
1a0fba8a2a Something about consistency and magnetic rifles. 2020-02-16 18:37:51 +01:00
Unknown
c0295156ff Adds synthmeat reaction 2020-02-16 11:42:30 -05:00
Unknown
3286f43d90 Didnt know I could make it a subtype 2020-02-16 11:17:54 -05:00
Unknown
313f544aee Make it require some heating 2020-02-16 08:34:08 -05:00
Unknown
38f32d28b7 Mixable Synthblood 2020-02-16 08:06:22 -05:00
Unknown
f4734e44f0 o ye this should be something else 2020-02-16 07:52:34 -05:00
Unknown
f0b3021f5d I miss my powergame 2020-02-16 07:41:26 -05:00
CitadelStationBot
006e05fa34 Automatic changelog generation for PR #10704 [ci skip] 2020-02-16 06:10:22 -06: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