cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-16 12:53:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,497 Commits 55 Branches 0 Tags
901b54b7e8d79d59eb51b9387d2bf4d4aaa1628c
Commit Graph

19666 Commits

Author SHA1 Message Date
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
Ghommie
1d9982d00a Virology support for synthetic blood and some blood subtypes removal. 2020-02-16 10:36:16 +01: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
Trilbyspaceclone
21e2a0892d Update meat.dm (#11028) 2020-02-16 07:46:45 +01:00
Trilbyspaceclone
a8d45f8361 Update crab.dm (#11105) 2020-02-16 07:39:56 +01:00
kevinz000
14fdd90618 Nerfs public autolathes (#10970) 2020-02-16 07:37:24 +01:00
kevinz000
a5f06430e4 repulse armor sanity (#10949) 2020-02-16 07:36:50 +01:00
Seris02
c95bb9f8db FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES hallucination (#10857) 
* FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES????

* fix

* no more getflaticon dabdabdabdabdabdabdab

* tada
 2020-02-16 07:31:30 +01:00
Ghom
abf7d2423a Update death.dm 2020-02-16 07:17:53 +01:00
Persi
18feba7fdd Defusal kits are now emag only and don't require a drop pod console. 2020-02-16 00:14:15 -05:00
Persi
23a9b9b438 Master got fixed while I was at work! 2020-02-16 00:07:24 -05: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
TrilbySpaceClone
cba6667332 it could work 2020-02-15 18:42:50 -05:00
keronshb
3b9f9d7a16 Requested changes 
Requested changes
 2020-02-15 18:15:41 -05:00
Trilbyspaceclone
470e786765 Update expressconsole.dm 2020-02-15 15:59:09 -05: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
Persi
0c9244f669 Clarifies comments and locks defusal kits behind an emag 2020-02-15 14:17:22 -05:00
kevinz000
ee9b38017e Merge pull request #10995 from Ghommie/Ghommie-cit568 
Something about cryopods.
 2020-02-15 12:17:02 -07:00
kevinz000
b46dd3246d Merge pull request #10968 from Citadel-Station-13/Ghommie-patch-4 
/datum/element/cleaning cleans your face!
 2020-02-15 12:16:39 -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
56545d742d Merge pull request #10923 from Citadel-Station-13/Ghommie-patch-7 
Nerfing cargo passive points generation
 2020-02-15 12:15:31 -07:00
kevinz000
fc5eeeac00 Update gun.dm 2020-02-15 12:14:51 -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
e250fb0a57 Merge pull request #11071 from Citadel-Station-13/Ghommie-patch-1 
Something about disposal bins and trash bags.
 2020-02-15 11:46:56 -07:00
kevinz000
6e2e7e29d1 Merge pull request #11072 from Ghommie/Ghommie-cit576 
Doubled halved flavor text max length and removed crappy code.
 2020-02-15 11:46:00 -07:00
kevinz000
29c422a2e6 Merge pull request #11073 from Ghommie/Ghommie-cit577 
Reduced tongue organ damage and tasting pH message spam.
 2020-02-15 11:45:50 -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
kevinz000
24b977f655 Merge branch 'master' into stuff 2020-02-15 11:45:25 -07:00
kevinz000
fa015c93bf Merge pull request #11047 from Trilbyspaceclone/patch-282 
Buffs oats and makes meatwheat have rarity
 2020-02-15 11:44:52 -07:00
kevinz000
76b5dec4bb Merge pull request #11040 from Ghommie/Ghommie-cit573 
Further mob holder fixes.
 2020-02-15 11:44:25 -07:00
Trilbyspaceclone
661e01ca0c Update miscellaneous.dm (#11094) 2020-02-15 19:12:19 +01:00
Ghommie
72efdec3fb Porting pair pinpointers and fixing an edge case runtime. 2020-02-15 19:12:07 +01:00
Ghom
8e3673480f Merge pull request #11048 from Trilbyspaceclone/patch-283 
Blood Drunk Miner now uses a PKA
 2020-02-15 09:05:45 +01:00
Ghom
06d38eb3dc Merge pull request #11086 from YakumoChen/the-ring-2 
Ring Improvements
 2020-02-15 09:04:54 +01:00
Ghom
ad639d5f2f Merge pull request #11084 from Citadel-Station-13/kevinz000-patch-7 
!tgs valentine
 2020-02-15 09:04:29 +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
kevinz000
f36b89a6e3 Update misc.dm 2020-02-14 11:53:50 -07:00
Ghom
0a1c3bd084 Merge branch 'master' into Ghommie-cit539 2020-02-14 19:42:36 +01:00