shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,539 Commits 5 Branches 0 Tags
051f5780dbdd7e173dcda60d0ed9275e11a9dfd5
Commit Graph

19553 Commits

Author SHA1 Message Date
DeltaFire
051f5780db tweaks 
Synthtissue borrowed health capped at 250, gradually flips from clonedamage towards toxdamage within 45 cycles.

Restores organ healing for strange reagent, but only in a very weak fashion (5 heal for failing organs)
 2021-12-31 00:16:49 +01:00
DeltaFire
bb3eb904eb resolves hypo inconsistancy 2021-11-03 03:03:18 +01:00
DeltaFire
99a4af025b hearts don't need blood 
typo
 2021-09-25 02:46:11 +02:00
DeltaFire
5b69a4680b whew 2021-09-22 22:36:36 +02:00
DeltaFire
7752e0d624 synthtissue and sr 2021-09-22 22:30:43 +02:00
kiwedespars
f3550fd87c blacklists morphine from dart guns, also haloperidol (#15152) 
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* yeag

* actually adds the blacklist

can't you feel my heart beat so, i can't let you go, want you in my life

* changes

* Update html/changelog.html

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>

Co-authored-by: Changelogs <action@github.com>
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
 2021-09-17 12:54:02 +02:00
DeltaFire
a4d71fcfa4 -debug comment 2021-09-16 03:18:52 +02:00
DeltaFire
b02825c679 uh oh 2021-09-16 03:14:24 +02:00
silicons
fb05100008 Update mouse.dm (#15115) 2021-09-15 00:16:57 +02:00
Lin
d53820d9bf Merge pull request #15130 from Citadel-Station-13/when_why 
[02:58:00] Runtime in atoms.dm, line 574: type mismatch: "catghost" &= 16777215
 2021-09-14 01:08:06 -05:00
silicons
4af82878dc Update uplink_ammo.dm (#15141) 2021-09-14 02:24:37 +02:00
silicons
6524e3d539 Update species.dm (#15126) 2021-09-14 02:23:52 +02:00
silicons
faed0eff01 Merge pull request #15099 from Hatterhat/tablets-gaming 
tablets gaming - an NT IRN "buff"
 2021-09-13 15:09:04 -07:00
silicons
abbd3d7708 Merge pull request #15120 from LetterN/what-if-i-updated-mafia-yeah-right 
Mafia updates
 2021-09-13 15:08:50 -07:00
Putnam3145
99908e17c5 Revert "Reworks supermatter gas output to be less cascade-y, more risky" 2021-09-13 11:39:32 -07:00
silicons
47568e50bf Merge pull request #15062 from zeroisthebiggay/patch-18 
bread is no longer equipped on the head; instead you actually hold it in your mouth
 2021-09-12 21:10:50 -07:00
silicons
e342145663 Merge pull request #15070 from zeroisthebiggay/prisoners 
prisoners - aka ports prisoners from tg hell yeah
 2021-09-12 20:59:12 -07:00
silicons
4f0d5e8c9a Merge pull request #15112 from Putnam3145/fix-supermatter-cascade 
Reworks supermatter gas output to be less cascade-y, more risky
 2021-09-12 20:58:48 -07:00
silicons
3a5f6e1649 Merge pull request #15113 from keronshb/unhuboxsm 
Stops the SM from blowing things up
 2021-09-12 20:58:36 -07:00
silicons
8d72664eef Merge pull request #15123 from keronshb/hitbyfix 
Fixes a runtime with Hitby
 2021-09-12 20:58:09 -07:00
silicons
4c058114a6 Update login.dm 2021-09-12 20:37:03 -07:00
Putnam3145
137a30a047 more nerfs lol 2021-09-12 15:04:42 -07:00
zerothebigboy
d41648b365 dumbasskevinz 2021-09-11 23:34:02 -04:00
zerothebigboy
223ba8d6c1 why 2021-09-11 23:20:01 -04:00
zerothebigboy
f077f374bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into why 2021-09-11 23:04:48 -04:00
zerothebigboy
ba72e3d8f0 why 2021-09-11 23:04:21 -04:00
keronshb
4cb198fe05 Fixes Hitby runtime 2021-09-11 17:38:32 -04:00
Putnam3145
083704e29d lowered max oxy mult, made temp not matter 2021-09-11 11:03:15 -07:00
Putnam3145
3965ad9dae yeah that's just too much gas sorry 2021-09-11 10:25:39 -07:00
silicons
149d149dff Merge pull request #15102 from timothyteakettle/icecream 
allows custom taste text and color on the custom ice cream setting in the ice cream vat
 2021-09-10 22:17:25 -07:00
Letter N
de4311e4d9 shut up 2021-09-11 12:50:06 +08:00
LetterN
791da1b9b4 mafia update. 2021-09-11 11:38:15 +08:00
zerothebigboy
68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
silicons
fd785c6abf Merge pull request #15063 from zeroisthebiggay/intern 
ports various tg armor resprites and some such
 2021-09-10 00:16:54 -07:00
silicons
4836f222d0 Merge pull request #15097 from LetterN/generic-housekeeping-pr 
Generic syncs
 2021-09-10 00:16:25 -07:00
keronshb
5587cc91cd Other fix 2021-09-09 21:56:58 -04:00
Lin
4883a93da1 Merge pull request #15092 from lolman360/patch-1 
allows autohydro trays to be manually filled
 2021-09-09 20:21:40 -05:00
Lin
a1a6414777 Merge pull request #15096 from Citadel-Station-13/movespeed 
Tweaks reagent speedups and taser slowdowns and fixes stabilzied light pink for those xenobio people
 2021-09-09 20:08:35 -05:00
Lin
43faf70d6a Merge pull request #15088 from Citadel-Station-13/silicons-patch-4 
how did no one notice ephedrine (see: every painkiller speedup buff which uses the same system) was broken until i abused it and got to be the beta tester?
 2021-09-09 20:08:22 -05:00
silicons
c600fae409 Merge pull request #15103 from SandPoot/cyborg-grippers 
Does some nice stuff on cyborg grippers
 2021-09-09 17:59:47 -07:00
Lin
0a005438ab Merge pull request #15100 from Citadel-Station-13/silicons-patch-5 
salt fixes colossus crystals not reading direction anymore due to a projectile update
 2021-09-09 19:51:05 -05:00
keronshb
8dfb97cdf7 SALTPR 2021-09-09 20:17:55 -04:00
Lin
3f09f56e3d Merge pull request #15101 from Citadel-Station-13/silicons-patch-6 
fixes the comedy antag parry gauntlets
 2021-09-09 19:10:51 -05:00
Putnam3145
cc2471cf7f Reworked supermatter gas output 
basically it's less likely to cause forever runaway trit fires... but it can still get runaway, it's just more power-based than temperature-based
 2021-09-09 13:51:22 -07:00
silicons
ead04910c2 Update preferences_savefile.dm (#15108) 2021-09-09 18:23:01 +02:00
zerothebigboy
5a8a069cd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern 
# Conflicts:
#	icons/mob/clothing/suit.dmi
#	icons/mob/clothing/suit_digi.dmi
#	icons/obj/clothing/suits.dmi
 2021-09-09 04:49:30 -04:00
silicons
69bd477a72 Merge pull request #15039 from keronshb/gradiantport 
Ports Colorist Quirk and Hair Gradients Preferences
 2021-09-08 20:41:00 -07:00
silicons
bb7ee63eae Merge pull request #15058 from zeroisthebiggay/headass 
the unatomized hypospray/medbay tools/emergency kits resprite
 2021-09-08 20:40:20 -07:00
silicons
9968d92bdc Merge pull request #15089 from keronshb/maskofmadness 
Mask of Madness no longer wallhacks
 2021-09-08 20:39:30 -07:00
Putnam3145
5eb272c0a6 Makes it so zaps don't explode pipes 2021-09-08 18:42:38 -07:00