shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,248 Commits 5 Branches 0 Tags
8b1e140fa0d43455e6bdee345ecb654dc5ce43cd
Commit Graph

2859 Commits

Author SHA1 Message Date
r4d6
e85e499504 I forgot a part. 
Copy-pasted the Angel's wings' bit of code to have something to show.
 2019-10-10 20:45:38 -04:00
r4d6
2d84b541cf Update wings.dm 2019-10-10 20:32:15 -04:00
r4d6
0d5770f986 Update species.dm 2019-10-10 20:32:12 -04:00
r4d6
e83460853c Update furrypeople.dm 2019-10-10 20:32:09 -04:00
kevinz000
3e6415d4b5 Merge pull request #9324 from Linzolle/crusher 
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
 2019-10-10 02:23:15 -07:00
kevinz000
c4f8956985 Merge pull request #9433 from Poojawa/hoss-tails 
Corrects a missing tail state
 2019-10-10 02:10:31 -07:00
kevinz000
f686ea75d3 Merge pull request #8615 from Ghommie/Ghommie-cit45 
Virtual reality componentization.
 2019-10-10 02:09:51 -07:00
kevinz000
0c9a065096 Merge pull request #8401 from Ghommie/Ghommie-cit11 
Refactoring Implants' loc n°3
 2019-10-10 02:09:37 -07:00
Ghommie
2ac24b2ac6 Fixing head rev blebs 2019-10-09 18:18:49 +02:00
Ghommie
735755019e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-09 01:18:30 +02:00
Poojawa
cbefe95ade Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into hoss-tails 2019-10-08 13:50:29 -05:00
kevinz000
abef83f56e Merge pull request #9427 from Ghommie/Ghommie-cit219 
Skeleton and zombie tweaks/balance (featuring "makes halloween skeletons not the overpowered pirate ones")
 2019-10-08 00:34:33 -07:00
kevinz000
8aacedaefa Merge pull request #9316 from Thalpy/Reagents_bitflats 
[READY] [FermiChem] Turns reaction vars into bitflags and adds a few new procs related to that.
 2019-10-08 00:33:21 -07:00
kevinz000
06e312b208 Merge pull request #9032 from Ghommie/Ghommie-cit178 
Ports plasmaman departmental envirosuits and tweaks.
 2019-10-08 00:28:06 -07:00
kevinz000
dcb37bfd0e Merge pull request #9418 from Ghommie/Ghommie-cit216 
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
 2019-10-07 23:36:11 -07:00
Thalpy
564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01:00
kevinz000
0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port 
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
 2019-10-07 23:29:19 -07:00
nik707
6803338df2 Merge pull request #9384 from jakeramsay007/Moar-Bugfixes 
Fixes the Trek uniform/suit sprites
 2019-10-07 18:19:59 -05:00
Ghommie
99e9280eaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178 2019-10-07 21:41:04 +02:00
Poojawa
93ad7f1066 Corrects a missing tail state 2019-10-07 04:30:23 -05:00
Ghommie
7dfd6005d9 I hate nerfing things :( 2019-10-06 19:24:31 +02:00
Ghommie
a1a3bbe99f Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones") 2019-10-06 19:16:13 +02:00
Thalpy
27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
Ghommie
cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-05 22:03:37 +02:00
Ghommie
32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-10-05 18:22:43 +02:00
Ghommie
3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
Fermi
79e85e2cfa Fixes some runtimes 2019-10-04 03:53:02 +01:00
deathride58
2058cbd09f Merge pull request #9390 from Ghommie/Ghommie_cit212 
Ensuring altdisarm() works as intended.
 2019-10-03 20:16:05 -04:00
deathride58
6e9a2553af Merge pull request #9393 from jakeramsay007/Even-More-Bugfixes 
Fixes AIs being unable to talk through holopads
 2019-10-03 20:12:59 -04:00
Chayse Ramsay
8cbd7d6c06 Fixes AIs being unable to talk through holopads 2019-10-02 21:14:11 +01:00
Ghommie
4855474955 Making sure altdisarm() works as intended. 2019-10-02 19:39:23 +02:00
Chayse Ramsay
68ca8a5ac0 whoops 2019-10-02 11:55:38 +01:00
Chayse Ramsay
5c827ed8ed Fixes the Trek uniform/suit sprites 
Not having mutant additions was causing the update_icons code to null out the alternate_worn_icon variable
 2019-10-02 04:08:25 +01:00
Ghommie
d2300765b2 adjacency checks. 2019-10-01 23:16:47 +02:00
Ghommie
cfcd325778 reworking the shoving people action. 2019-10-01 23:13:08 +02:00
Ghommie
340f8498a3 Fixes some more issues with shoving people. 2019-10-01 22:11:41 +02:00
kevinz000
250c6ed986 Merge pull request #9367 from Poojawa/totally-radical 
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
 2019-10-01 00:12:32 -07:00
Fermi
553818504c Hoepfully fixes unwanted traumas in the dead. 2019-10-01 06:21:34 +01:00
Fermi
89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00
kevinz000
0febc1977a Merge pull request #9191 from Linzolle/fireman 
Ports fireman carrying from /tg/
 2019-09-28 00:38:08 -07:00
kevinz000
cc64b8e0a4 Merge pull request #9320 from Ghommie/Ghommie-cit200 
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
 2019-09-28 00:22:13 -07:00
Fermi
391af0f946 I have no idea why the brain doesn't decay, but this seems to fix it. 2019-09-28 07:26:59 +01:00
Fermi
d44fbd3fb1 Brain fix 2019-09-27 23:46:44 +01:00
Fermi
b622ea4fd2 Fixes 2019-09-27 13:49:25 +01:00
Thalpy
1bdb66d5de Okay a few things I just saw 2019-09-27 07:28:02 +01:00
kevinz000
436e01ed0e Merge pull request #9335 from Raptorizer/Guardian_Parasite_Buffs 
Guardian/Holoparasite Buffs
 2019-09-26 19:33:25 -07:00
JTGSZ
5b3f6dca29 Species Job Check 2019-09-23 23:58:57 -04:00
lolman360
6598a8c9c2 Pooj 2019-09-22 16:18:15 +10:00
kevinz000
e44f52d89a Merge pull request #9122 from Sishen1542/oops-i-did-it-again 
nerf gygax melee damage, removes mech KO punches and replaces with extra knockback (and also neuters actuator overload)
 2019-09-21 19:07:40 -07:00
kevinz000
72cbaf1307 Merge pull request #9307 from BurgerLUA/Jetpack-Tweak 
Reduces jetpack speed bonus on CERTAIN jetpacks while doubling efficiency
 2019-09-21 19:04:11 -07:00