shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,106 Commits 5 Branches 0 Tags
e32f0a613f985fa694d3cfd04666ae457acef49b
Commit Graph

194 Commits

Author SHA1 Message Date
DeltaFire
d3f3862e18 Merge pull request #13696 from silicons/slime_tf 
refactors slime shapeshifting, blobform, and limb regrowth to generic mob ability datums for !!no reason at all other than code improvement!!
 2020-12-14 05:57:03 +01:00
DeltaFire
282a5d6ab2 aaactually lets just make robots immune in general 2020-11-24 20:32:42 +01:00
DeltaFire
a3208d1ac8 synth alcohol immunity 2020-11-24 20:27:34 +01:00
silicons
27c4dff507 ports 2020-11-21 21:02:54 -07: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
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
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02: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
silicons
7f611a98e1 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-10 22:23:22 -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
silicons
1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
timothyteakettle
950cb05617 Merge remote-tracking branch 'upstream/master' into slime-puddle 2020-10-02 15:53:48 +01:00
timothyteakettle
121ec996cf fuck it no resting 2020-10-01 23:09:20 +01:00
Timothy Teakettle
57733473fe TRAIT SOURCE DEFINE 2020-10-01 21:23:17 +01:00
Timothy Teakettle
2223cfeb28 better 2020-09-30 18:41:30 +01:00
Timothy Teakettle
d783eb58bd more traits 2020-09-30 02:58:58 +01:00
silicons
31791df2bd fixes 2020-09-21 20:38:43 -07:00
Timothy Teakettle
125b50d392 Merge branch 'master' into cool-ipcs 2020-09-16 05:09:02 +01:00
Hatterhat
3b571e2edf oh jesus fuck its all gone wrong 2020-08-30 01:33:56 -05:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Timothy Teakettle
0bf9553eca hmm 2020-08-02 19:13:39 +01:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Timothy Teakettle
0d197e82f8 Merge branch 'master' into cool-ipcs 2020-06-19 01:57:02 +01:00
Timothy Teakettle
eba1e8f301 fixes the merge conflicts 2020-06-15 23:29:49 +01:00
Ghom
7513e032e3 petrification improvements (#12375) 
* petrification improvements

* Standards.
 2020-06-14 23:04:12 -07:00
Timothy Teakettle
f2aa370506 make ipcs cool 2020-06-04 14:59:52 +01:00
kevinz000
433bd1af79 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-27 18:11:15 -07:00
Ghom
85186a9714 Porting updates related to material datums. (#12317) 
* Porting updates related to material datums.

* art_type

* oh oh
 2020-05-25 14:21:00 -07:00
kevinz000
e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
Arturlang
32135cc008 Makes bloodsuckers unguttable and undecappable (#12335) 
* Bloodsuckers cant be gutted or beheaded anymore

* Mistakes were made
 2020-05-24 13:08:18 -07:00
Ghom
ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -07:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -07:00
kevinz000
f034c7c536 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-05 17:38:43 -07:00
Kraseo
c79ece7449 really surprised this wasn't done earlier 2020-05-04 18:30:27 +02:00
kevinz000
af08e0fecf Merge pull request #11984 from Hatterhat/fastpump 
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
 2020-04-25 17:07:29 -07:00
Ghommie
e17c51a85d Porting some VV updates from tg. 2020-04-25 00:49:51 +02:00
Hatterhat
c686ed193b a book about mashing Z and LMB 2020-04-22 17:55:11 -05:00
Artur
2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
Artur
fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
kevinz000
3c4c397c46 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-04-08 04:04:45 -07:00
necromanceranne
d1e77ab087 Merge branch 'master' into pawnch_2_the_pawnchening 2020-04-06 12:31:16 +10:00
necromanceranne
0c46c151f9 Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage. 2020-04-03 19:42:25 +11:00
Artur
65ec9f3723 Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again 2020-04-01 13:03:06 +03:00
Artur
4de14fbdf7 Finnishing touches 2020-04-01 12:59:06 +03:00
kevinz000
6e140f003c cloners now give TRAIT_MUTATION_STASIS and prevent active genes from ticking while inside (#11691) 
* Update cloning.dm

* Update traits.dm

* Update life.dm

* Update code/__DEFINES/traits.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-30 23:24:51 +02:00