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

3310 Commits

Author SHA1 Message Date
DeltaFire
a07ab809ff fixes a thing 
Previously, if a wound was removed while there wasa  surgery related to it going on, it'd just qdel() the surgery, which is.. kinda weird, since it, y'know, takes the closing step away from you, and all wound surgeries have checks for no wound being present anyways.
 2020-10-31 18:04:59 +01: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
1a1b6af819 Merge pull request #13603 from kappa-sama/patch-43 
controversial shotgun buff (very scary)
 2020-10-28 07:44:02 -07: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
silicons
231c5f0a9d Merge pull request #13581 from Ghommie/Ghommie-cit840 
mime/clown masks' face concealment toggleable with altclick. Plasmaman helmet welding visor & smiley port.
 2020-10-21 15:43:09 -07:00
kappa-sama
aa696edd84 this 2020-10-20 19:39:23 -04:00
Putnam3145
ac823ae29b Merge pull request #13583 from Citadel-Station-13/silicons-patch-1 
fixes squeak components reacting to cross rather than crossed
 2020-10-18 22:45:59 -07:00
Zandario
fcd8fec815 Fixes an oversight and updates some defines (#13558) 2020-10-17 12:37:58 +02:00
silicons
f16343d726 Update squeak.dm 2020-10-16 20:48:11 -07:00
Ghommie
c0f3317c01 mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port. 2020-10-16 20:27:09 +02:00
Timothy Teakettle
8287005dd5 does what it says on the title (#13563) 2020-10-15 11:49:05 +02: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
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
2919dfee2e Merge pull request #13014 from Hatterhat/tendril-minimum 
[REVIEW PLEASE] Minimum Megas/Tendrils For Lavaland But Cleaner I Swear
 2020-10-10 21:58:15 -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
385bd57940 reworks family heirlooms, adds heirlooms that can be based off your species (#13444) 
* corgi tracker

* better heirloom system

* typo
 2020-10-10 12:15:39 +02:00
Timothy Teakettle
e2c6a19da7 Merge branch 'master' into slime-puddle 2020-10-07 23:37:30 +01:00
Putnam3145
4b700a3ff7 Merge pull request #13490 from Citadel-Station-13/silicons-patch-8 
kind of easy to tell if you have a fake virus if it's ticking at 20 times the speed of a normal virus right
 2020-10-07 15:08:12 -07:00
silicons
1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
silicons
56a7499cef Merge pull request #13496 from Detective-Google/deadchat-kablooey 
allows players in deadchat to see explosions
 2020-10-06 17:05:06 -07:00
DeltaFire
06cb91ca3d updates all BODYPART_ORGANIC occurances 
:)
 2020-10-06 18:01:25 +02: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
Detective Google
6d14d37e5f adds deadchat span 2020-10-04 13:34:36 -05:00
silicons
7f7ba4caf8 Merge pull request #13481 from DeltaFire15/smithery-fixes 
A bunch of blacksmithing fixes / tweaks
 2020-10-03 18:02:42 -07: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
DeltaFire
79af981467 fixes some fun limb code 2020-10-03 21:51:49 +02:00
Letter N
09283ca485 beans 2020-10-03 13:49:20 +08:00
Zandario
1620e3887c Merge branch 'master' into species-refactor 2020-10-02 17:19:48 -05:00
Zandario
bdd121cd81 Prep Work 2020-10-02 17:17:50 -05:00
Detective Google
52e8e2996c allows players in deadchat to see explosions 2020-10-02 14:26:11 -05:00
timothyteakettle
418cd44bbe SQUISH 2020-10-02 16:31:33 +01:00
Tupinambis
d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
Timothy Teakettle
7726b0456c Merge branch 'master' into cool-ipcs 2020-10-01 21:06:16 +01:00
silicons
05e1f7ca99 Update debuffs.dm 2020-10-01 12:50:41 -07:00
Letter N
84a6624b03 Update cinematic.dm 2020-10-01 18:18:24 +08:00
silicons
3149732bbb Merge pull request #13441 from Putnam3145/shiver-fever-patch 
Makes fever use the proper thresholds and shivering have thresholds at all.
 2020-10-01 03:11:23 -07:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework 
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
 2020-10-01 03:01:18 -07:00
Ghom
fb95d873aa Merge pull request #13383 from Citadel-Station-13/silicons-patch-37 
fixes bomb component allowing pickup
 2020-10-01 11:42:21 +02:00
Letter N
5418fb5b01 fixes minimaps and cinematic, also adds some dmdoc things 2020-10-01 17:36:56 +08:00
Putnam3145
44f05bcb21 Merge pull request #13372 from Citadel-Station-13/silicons-patch-35 
please stop using explosive holoparasites to make instant kill toolboxes
 2020-10-01 02:35:12 -07:00
Putnam
9f871dfa17 Makes shivering and fever not broken. 2020-09-26 11:22:24 -07:00
DeltaFire
0746116e17 fixes a bunch of blacksmithing stuff 
the blacksmithing skill is now actually dwarfy instead of not because of a typo

picking up how ingots without gloves is now not a better decision than picking them up with non-heatresistant gloves.

you can't interact with anvils while they are already being worked to prevent issues.

Also fixes associative skill level code a tiny bit.
 2020-09-25 22:04:55 +02:00