shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,316 Commits 5 Branches 0 Tags
3a2a9997bd4c02e313ffca2c9902b0eaefce4b4c
Commit Graph

4727 Commits

Author SHA1 Message Date
DeltaFire
3a2a9997bd moves corruption handler 
Moves handle corruption from carbon/life.dm into its own file for easier access.
 2020-11-13 16:34:21 +01:00
DeltaFire
dd44193597 oop 2020-11-13 04:29:04 +01:00
DeltaFire
5b134bd84b headbonks cause system corruption 
Title. Instead of taking brain damage from head hits, robots take 5 system corruption instead, which is effectively 5 bonus damage. Bonk.
 2020-11-13 04:07:32 +01:00
DeltaFire
8710e73cb6 renames a corruption effect 
message > avoided, as that is pretty much what it means
 2020-11-13 03:53:33 +01:00
DeltaFire
5820690eba EMPs cause system corruption, a bunch of it 
EMPs now cause severity / 5 system corruption. Considering severity goes from 1 to 100, this is effectively 0.2 - 20 corruption per pulse
Might be a bit too high, if it is severity / 10 should definitively be alright. Or even a nonlinear amount.
 2020-11-13 03:39:55 +01:00
DeltaFire
1961e1ed3c no random toxdamage vomit for robots 
Title. Organics sometimes vomit at high toxdamage, robots get the fun of the handle_corruption() system instead
 2020-11-13 03:33:50 +01:00
DeltaFire
8948133efc rads cause coruption at high levels, very slowly. 2020-11-13 03:25:56 +01:00
DeltaFire
5af48a22dd adds a surgery to fix corruption 2020-11-13 02:24:52 +01:00
DeltaFire
b9ba55a77e modifies roll weights, informs people on inducetrauma 2020-11-13 01:11:53 +01:00
DeltaFire
b8e67ca06f temp change error always heats up 2020-11-13 01:04:55 +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
8ce058a593 Fixes stupid mistakes 2020-11-09 14:39:51 +02:00
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
silicons
6ed0563bab Merge pull request #13655 from timothyteakettle/haha-slip-go-brrr 
fixes held items proccing crossed when passing someone
 2020-11-07 00:31:07 -07:00
silicons
cc56fc560e Merge pull request #13635 from Hatterhat/funny-hands-nerf 
bone gauntlets bandaid nerf
 2020-11-07 00:20:01 -07:00
timothyteakettle
3d2c07be82 Update human.dm 2020-11-03 22:59:24 +00:00
DeltaFire
2f32879b16 smol change 
instead of setting intent, we call the proc for it
 2020-11-01 22:35:57 +01:00
DeltaFire
4ebbf0b2dd more typos 2020-11-01 22:26:31 +01:00
DeltaFire
985300b87b typo 2020-11-01 22:14:51 +01: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
93dd754d46 slightly weaker ampcorrupt 
10 > 5
 2020-11-01 21:54:29 +01:00
DeltaFire
721521b125 tweaks the tempchanging error 
70-100 degrees up or down
 2020-11-01 21:53:16 +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
d6e7eef1dc corruption handling (for carbons) 
Heavily work in progress system that causes malfunctions every now and then with varying levels of corruption; Higher corruption means worse effects and more frequent rolls.
 2020-11-01 06:09:53 +01:00
DeltaFire
827ddbeed9 species support 
the robotic species now get the robotic_organism trait
 2020-11-01 05:14:06 +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
1baa3013b3 Merge pull request #13626 from zeroisthebiggay/GOD 
[SALT] MAKES MEGAFAUNA ITEMS LAVAPROOF (LIKE THE LAVA STAFF)
 2020-10-28 07:53:44 -07:00
silicons
0307884eab Merge pull request #13627 from Ghommie/Ghommie-cit841 
Here I fix a few issues.
 2020-10-28 07:53:22 -07:00
silicons
6d2028abb5 Merge pull request #13601 from timothyteakettle/critical-item 
antagonistic items will no longer fail to be placed on you
 2020-10-28 07:43:39 -07:00
Hatterhat
a4196e567b i told me there'd be balance issues 2020-10-27 22:35:27 -05:00
Ghommie
f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
zeroisthebiggay
626fcf0aeb OOPS 
FUCK
 2020-10-25 05:36:59 -04:00
zerothebigboy
6577aaac91 FRUSTRATION 2020-10-25 05:30:06 -04:00
silicons
585208dda9 Update angel.dm (#13621) 2020-10-24 21:22:32 +02:00
Timothy Teakettle
4afceebcc1 critical 2020-10-20 02:11:08 +01:00
Zandario
fcd8fec815 Fixes an oversight and updates some defines (#13558) 2020-10-17 12:37:58 +02:00
Putnam3145
f6b93a242c Makes get_damaged_bodyparts use proper arguments (#13570) 
* you're not being clever, you're being obfuscatory, stop this

* Made get_damaged_bodyparts use proper arguments

* Actually shouldn't have the arg
 2020-10-17 11:44:15 +02:00
DeltaFire15
ca21572aa7 Fixes vamp shapeshifting a bit (#13562) 
* fixes vamp shapeshifting a bit

Title. Buncha weird stuff happening.

* ghom's request

moves the check to ../bat/cast(), adds type safety
 2020-10-17 11:39:58 +02:00
MrJWhit
4fdacf0560 Porting putnams ventcrawling PR and Fix (#13571) 
* Porting putnams rage

* And the bugfix
 2020-10-17 11:39:25 +02:00
zeroisthebiggay
ea80867cda Update legion.dm (#13566) 2020-10-15 11:48:12 +02:00
Putnam3145
78a9c61952 Makes dwarf text not check every replacement every time. (#13346) 
* Makes dwarf text not check every replacement every time.

* Apply suggestions from code review

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-10-12 13:26:18 +02:00
silicons
a5ace5ed3a Merge pull request #13543 from zeroisthebiggay/tyrna 
ports tg legion reworks, colossus now enrages against sand golems, and some minor sprite stuff with him too
 2020-10-11 17:33:16 -07: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
8c22580c08 Update species.dm 
consistent commenting even though it's not consistent anyway.
 2020-10-11 14:35:59 -05:00
Tupinambis
3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
DeltaFire
36ac341e81 e 
empty lastline moment
 2020-10-11 15:45:07 +02:00