shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,326 Commits 5 Branches 0 Tags
dca90db321f828d5987c258ea7b91fa26588b549
Commit Graph

1144 Commits

Author SHA1 Message Date
Poojawa
dca90db321 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-29 23:03:26 -05:00
Poojawa
bda3ac8745 blood dna is fixed, your ERP code is too 2019-08-20 07:41:50 -05:00
Poojawa
a0308a2760 Enables Poly phrases on tgs commands 2019-08-18 08:29:28 -05:00
Poojawa
569e33fdbc Update human.dm 2019-08-17 05:55:47 -05:00
Poojawa
2d40733ff7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-17 05:43:05 -05:00
Poojawa
088bc484e3 Forensics re-destroyed, but better this time. 
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
 2019-08-17 02:43:59 -05:00
kevinz000
9071917e72 Merge pull request #9088 from Poojawa/blurry-runtimes 
Fixes some runtimes and removes a holodeck exploit
 2019-08-16 17:05:21 -07:00
kevinz000
ce62780ba0 Merge pull request #9095 from fludd12/snowflake-b-gone 
Un-snowflakes My Custom Item
 2019-08-16 17:04:45 -07:00
kevinz000
97306ff53c Merge pull request #9107 from deathride58/fixesarest 
Fixes handcuffs being impossible to actually resist out of
 2019-08-16 16:57:36 -07:00
Poojawa
264cbf8108 reverts the add_blood back to add_blood_DNA 2019-08-15 12:49:10 -05:00
Poojawa
0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa
2073921f4b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-15 08:39:41 -05:00
Poojawa
017a3111ec Yeah this is a much, much better way of doing it. 2019-08-15 08:37:10 -05:00
Poojawa
3de3f511cf Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes 2019-08-15 08:24:55 -05:00
deathride58
7879d1ce13 Merge pull request #9103 from Citadel-Station-13/atmosberet 
Donator item
 2019-08-14 15:44:24 -04:00
deathride58
2406254faa Merge pull request #9100 from cebutris/got-milk 
Breasts no longer lactate by default, Lactation is now a preference
 2019-08-14 15:40:53 -04:00
Fermi
5a9b2bcad7 Added COORD 2019-08-12 05:10:46 +01:00
Fermi
ae1191a469 Changes an oversight (and a unintended wah!) 2019-08-12 05:10:05 +01:00
kevinz000
123b478edd Merge pull request #8927 from Ghommie/Ghommie-cit151 
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
 2019-08-11 10:12:20 -07:00
deathride58
675c042958 Update __donator.dm 2019-08-11 08:38:13 -04:00
deathride58
5dddb11773 Fixes handcuffs being impossible to actually resist out of 2019-08-11 08:37:00 -04:00
Jay
f17aea268c Donator item 2019-08-11 01:07:20 -05:00
Poojawa
dcd682bd59 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-10 23:48:47 -05:00
Cebutris
df136ab96c lactation is now a preference 2019-08-10 23:28:16 -04:00
Fel
5dc2124df0 Update custom_items.dm 2019-08-09 19:00:21 -04:00
Fermi
eb9e6a041d Ghommie's fix. 2019-08-09 12:17:54 +01:00
Poojawa
f76bb27127 Fixes some runtimes and removes a holodeck exploit 
and a cleanup >.>;
 2019-08-08 21:33:42 -05:00
Ghommie
12c4fc139d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151 2019-08-09 04:00:23 +02:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Fermi
9d3aa1f3b0 Removing a comment block I missed. 2019-08-08 18:28:47 +01:00
Fermi
99e95dcedf Guess who forgot message admins 2019-08-07 18:57:38 +01:00
Fermi
b4208860d8 Spelling and a few more logs. 2019-08-07 17:45:40 +01:00
Fermi
a8e2311caf Bloomin' indents! 2019-08-07 14:53:20 +01:00
Fermi
7391581a26 2 small fixes. 2019-08-07 11:33:53 +01:00
Fermi
f4c5e6fd2f Attempts to deal with the potential future problem of people stunlocking 2019-08-06 16:43:55 +01:00
Thalpy
53e9c140cf Merge pull request #22 from Citadel-Station-13/master 
YARR
 2019-08-06 16:08:16 +01:00
BlackMajor
98cecb2cc7 Merge pull request #8923 from Citadel-Station-13/kevinz000-patch-53 
Removes damage from *dab
 2019-08-06 21:47:52 +12:00
BlackMajor
d8d6fda259 Merge pull request #9050 from Ghommie/Ghommie-cit179 
Fixes combatmode pushing not knocking people down against walls.
 2019-08-06 21:28:29 +12:00
kevinz000
eab07c62de Merge pull request #9045 from CameronWoof/codifying-mrp-again 
Officially ends the non-stop thrill ride of coating the station in your gender fluids for "fun"
 2019-08-05 14:57:54 -07:00
CameronWoof
d09fa0d8a0 fix for smoke and odysseus exploits 2019-08-05 07:48:27 -07:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
kevinz000
b292bc7187 Merge pull request #9007 from Ghommie/Ghommie-cit168 
Fixes and standarizes sword sheaths/scabbards overlays.
 2019-08-05 00:49:49 -07:00
kevinz000
f1c9a07f6d Merge pull request #8912 from Ghommie/Ghommie-cit146 
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
 2019-08-04 22:41:49 -07:00
Ghommie
cf81a57efa Adds in turf density checks, replaced object density checks with CanPass() 2019-08-05 05:33:47 +02:00
kevinz000
de675a10e7 Merge pull request #9025 from Poojawa/patch-1 
Actually fixes Vore sounds for real this time
 2019-08-04 19:08:16 -07:00
Fermi
40d6dc1812 Oops. 2019-08-04 14:54:40 +01:00
Poojawa
7d65ddb417 bug blood, ipc/slime hearts, blood gen protolathe 
we're all gucchi now boys
 2019-08-04 04:07:44 -05:00
CameronWoof
6f02c5c6f6 don't pre-fill the tank 2019-08-04 01:10:17 -07:00
CameronWoof
900d8d00af Officially ends the non-stop thrill ride of coating the station in your various fluids for "fun" 2019-08-03 20:37:02 -07:00
kevinz000
64267c7ce2 Merge pull request #9001 from Linzolle/skirtfix 
fix sec and hos skirts
 2019-08-01 23:26:07 -07:00