shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,481 Commits 5 Branches 0 Tags
2c01acd5f5797e6bd2e10b3bf56f08f18eeb5cbb
Commit Graph

2386 Commits

Author SHA1 Message Date
silicons
c7396632db Merge pull request #13582 from timothyteakettle/i-hate-mcolor 
adds advanced colouring mode: allows you to individually colour mutant parts
 2020-11-22 13:33:28 -07:00
silicons
f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption 
[TESTMERGE ONLY] System Corruption for robotic species
 2020-11-18 22:54:51 -07:00
Putnam3145
9d300ade35 Merge pull request #13677 from silicons/newlines 
Adds missing EOF newlines
 2020-11-18 17:50:38 -08:00
silicons
891d4ec76e Merge pull request #13681 from DeltaFire15/supplypod-shrapnel 
Fixes a bunch of supplypod related stuff
 2020-11-17 01:12:56 -07:00
tgstation-server
03b2f1ac2e Update TGS DMAPI 2020-11-17 00:37:11 +00:00
DeltaFire
410ffffcc3 there we go 
robot rad safe: 250, 750 with upgrade (500 for normal mobs)

Also some typo fixes
 2020-11-15 20:30:50 +01:00
DeltaFire
e0b2156142 fixes fixes fixes 2020-11-14 19:26:54 +01:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
DeltaFire
5af48a22dd adds a surgery to fix corruption 2020-11-13 02:24:52 +01:00
DeltaFire
76fe1a77bc Merge remote-tracking branch 'upstream/master' into system-corruption 2020-11-13 01:00:50 +01:00
silicons
0001a2edca Merge pull request #13669 from Arturlang/sacrifice_tweaks 
Makes cult sacrifice not permakill people anymore.
 2020-11-11 11:16:15 -07:00
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
LetterJay
10c90e06c1 Merge pull request #13661 from timothyteakettle/age-verification 
adds in-game age verification as an alternative to access requests
 2020-11-08 11:07:05 -06:00
Timothy Teakettle
7a82f53e75 attempte fixes 2020-11-08 16:45:32 +00:00
silicons
7bce2115db Merge pull request #13642 from Citadel-Station-13/tgs-dmapi-update 
Automatic TGS DMAPI Update
 2020-11-07 00:33:36 -07:00
silicons
ab33acf962 Merge pull request #13602 from Putnam3145/better_dynamic 
Adds a new "minor antag" roundstart to dynamic
 2020-11-07 00:18:51 -07:00
tgstation-server
ce8dba6062 Update TGS DMAPI 2020-11-07 00:37:22 +00:00
Timothy Teakettle
e2ca7164b9 age verification 2020-11-06 21:00:14 +00:00
Timothy Teakettle
022f996cfa better fix 2020-11-05 17:28:32 +00:00
silicons
d500a12b70 adds EMOTE_BOTH and EMOTE_OMNI which is both audible/visible and ignores checks entirely. subtler/subtle is omni and regular emotes are both. (#13584) 
* Update say.dm

* Update mob.dm

* Update emotes.dm

* Update say_vr.dm

* Update emote.dm

* Update emotes.dm

* Update mob.dm

* Update say_vr.dm

* Update drake.dm
 2020-11-01 22:09:38 +01:00
silicons
4017618744 removes batform from roundstart halloween vampire (#13623) 
* Update species.dm

* Update vampire.dm

* Update vampire.dm
 2020-11-01 22:05:49 +01:00
DeltaFire
154ccd5421 adds effects to corruption 
Every ten seconds or so, while being above the low threshhold for corruption, you roll a prob(corruption) roll. If it goes through, you get affected by one of various effects depending on how corrupt your system is, from just getting a message and healing a bit of corruption, over getting halluscinations / getting muted for a bit, to getting forcefully sleeped after a 6-10 second warning
 2020-11-01 21:47:38 +01:00
Timothy Teakettle
46dbb9345d slime puddles look better and cant be abused by lings (#13567) 
* perfect

* further changes

* no squeaking please

* no more squeaking damnit

* no more squeaking damnit

* slower

* they get broken armor

* broken armor application

* Apply suggestions from code review

* add a comma

* make crossed work properly

* Update squeak.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-11-01 21:40:58 +01:00
DeltaFire
ed08983b97 syscorruption framework 
Adds a framework for systems corruption instead of toxins damage for use in synthetic species. No ways to deal / heal it yet, nor effects, or actual uses. Soon.
 2020-11-01 04:56:31 +01:00
timothyteakettle
cf49e78d45 Merge remote-tracking branch 'upstream/master' into i-hate-mcolor 2020-10-27 22:12:55 +00:00
Putnam
1738233c27 Adds a new "minor antag" roundtype to dynamic 
with an associated storyteller, even
 2020-10-19 20:20:51 -07:00
Putnam
558d11bc73 Stringified the vote #defines for easier config stuff 2020-10-18 14:49:43 -07:00
Timothy Teakettle
5e780064c1 fixes and a toggle 2020-10-17 19:47:46 +01:00
Zandario
fcd8fec815 Fixes an oversight and updates some defines (#13558) 2020-10-17 12:37:58 +02:00
timothyteakettle
4f5465c39e fixes 2020-10-17 01:00:04 +01:00
Timothy Teakettle
2c6e8fd87d what if color was cool 2020-10-16 22:28:00 +01:00
silicons
29b7b49fe9 Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2 
Robotic limbs 2 : Threshhold Boogaloo
 2020-10-11 17:33:00 -07:00
Tupinambis
3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
DeltaFire
a5fce4b6ed Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2 2020-10-11 15:39:41 +02:00
BlackMajor
bf7d68884b Merge pull request #13510 from silicons/google 
a more sane json-based map override system for jobs (todo port to rp so rp can have map rotation)
 2020-10-11 18:39:10 +13:00
silicons
7f611a98e1 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-10 22:23:22 -07:00
silicons
737b6460af Merge pull request #13497 from Zandario/species-refactor 
Refactors some defines for easier Species Development
 2020-10-10 22:00:49 -07:00
silicons
8b48cab574 Merge pull request #13233 from Hatterhat/za-hando 
[READY] za hando - a pr about ling claws and punching shit
 2020-10-10 21:59:05 -07:00
DeltaFire
4ccf40f775 Revert "Revert "Merge branch 'master' into robotic-limbs-PT2"" 
This reverts commit 27a099c6bf.
 2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf Revert "Merge branch 'master' into robotic-limbs-PT2" 
This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
 2020-10-11 00:51:39 +02:00
DeltaFire
73b5267425 Merge branch 'master' into robotic-limbs-PT2 2020-10-11 00:44:28 +02:00
silicons
ad32b8f437 Merge pull request #13472 from timothyteakettle/slime-puddle 
the pr that lets slimes turn into useless puddles
 2020-10-10 11:14:25 -07:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Timothy Teakettle
e2c6a19da7 Merge branch 'master' into slime-puddle 2020-10-07 23:37:30 +01:00
silicons
1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
silicons
3557f00316 Merge pull request #13498 from deathride58/lingbloodupgrade 
Lingblood rework (Loudness is now an average, rather than a sum)
 2020-10-06 17:04:38 -07:00
silicons
f6bbfc2c88 Merge pull request #13513 from timothyteakettle/eye-sprites 
adds selectable eye types to customization
 2020-10-06 16:51:44 -07:00
DeltaFire
4146566af0 hoo boy 
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
 2020-10-06 17:34:13 +02:00
silicons
20f1e0818e Merge pull request #13479 from LetterN/another-update-mayhaps 
Fixes minimap, and dmdocs other things
 2020-10-03 18:02:29 -07:00
Timothy Teakettle
b48f4b91e6 Merge branch 'master' into eye-sprites 2020-10-04 01:23:03 +01:00