shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,018 Commits 5 Branches 0 Tags
8fb0a68febb2096f9717c4e663e68eafa02a4985
Commit Graph

10202 Commits

Author SHA1 Message Date
MMMiracles
8fb0a68feb Adds Hat Throwing (#45355) 
* adds hat throwing on people and borgs

* clothing flags, hats can knock off non-items, borg hat blacklist check

* prevents hats with items in them from being able to land on heads

* removes extra equip, hats can go on the hatless again, tinfoil fix

* if

* bit flag
 2019-10-25 16:19:19 -05:00
BlackMajor
1705765555 Update hilbertshotel.dm 2019-10-25 23:02:09 +13:00
kevinz000
bd9443252a Merge pull request #9579 from YakumoChen/shapeshift 
Ports #41638 and #43784, "Wizard Shapeshift now converts damage taken while transformed"
 2019-10-24 19:13:54 -07:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54 
ports in the Hilbert's Hotel.
 2019-10-24 19:07:33 -07:00
kevinz000
da502aa31d Merge pull request #9535 from Ghommie/Ghommie-cit247 
Fixing sniper rifles scope datum action oddity.
 2019-10-24 19:05:25 -07:00
kevinz000
2a57a7c8a6 Merge pull request #9568 from r4d6/patch-3 
[Fix]Make Cells not a viable replacement for the Stock Part Cheese
 2019-10-24 19:04:15 -07:00
kevinz000
236cf328d1 Merge pull request #9567 from BlackMajor/Yote 
Clockwork golems can now use guns
 2019-10-24 19:03:49 -07:00
kevinz000
3e455f76e9 Merge pull request #9591 from Ghommie/Ghommie-cit261 
Ports "Avoid generating the atom colour list on the lighting object"
 2019-10-24 18:56:26 -07:00
kevinz000
9a74d91106 Merge pull request #9542 from Trilbyspaceclone/patch-231 
Lowers Cargo most packs down to Pre- MK I Cargo rework*
 2019-10-24 18:51:34 -07:00
kevinz000
d8fc3e7211 Merge pull request #9564 from kappa-sama/aliumtators 
The syndicate are led by aliens.
 2019-10-24 18:49:48 -07:00
kevinz000
02a1aaea34 Merge pull request #9548 from Ghommie/Ghommie-cit251 
Fixing radio emotes conflict with drunk memes.
 2019-10-24 18:48:33 -07:00
kevinz000
eb50df892a Merge pull request #9550 from Ghommie/Ghommie-cit253 
Fixes temporary transformation sting triggering heart attacks on heartless humans.
 2019-10-24 18:48:09 -07:00
kevinz000
4b2b3a26b3 Merge pull request #9577 from Feasel/patch-1 
[Balance Pass] - Supermatter Mega Delam (Tesla)
 2019-10-24 18:47:29 -07:00
kevinz000
d0e9f63734 Merge pull request #9585 from Ghommie/Ghommie-cit257 
Fixes artificier lesser magic missile.
 2019-10-24 18:46:27 -07:00
kevinz000
969bc83179 Merge pull request #9586 from BlackMajor/Yeehaw 
Adds posibrains to the spawners menu for ghosts.
 2019-10-24 18:45:57 -07:00
kevinz000
2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258 
Porting components updates and fixing phantom thief component.
 2019-10-24 18:38:39 -07:00
Ghommie
a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie
4c8d7023c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258 2019-10-24 09:50:20 +02:00
YakumoChen
3e9dfd6441 i was suggested to try this 2019-10-24 02:59:15 +00:00
YakumoChen
c6939864c1 and this 2019-10-24 02:42:38 +00:00
YakumoChen
5a9f0aa1e4 this too 2019-10-24 02:33:48 +00:00
YakumoChen
3ec63ed12d I think I forgot this 2019-10-24 02:32:21 +00:00
deathride58
f85f110baa Merge pull request #9047 from Poojawa/syntheticbloods 
RGB Blood Reworks + Blood generator
 2019-10-23 20:54:55 -04:00
BlackMajor
2a6cbe4df2 Merge pull request #8938 from Citadel-Station-13/kevinz000-patch-55 
Adds pyro/cryo/advanced grenade casings to science, as well as test range firing pins, floralrays, and stunshells
 2019-10-24 13:48:29 +13:00
kevinz000
ab02626ef7 Merge pull request #9588 from ItzGabby/Gabby-bat_species_parts 
Anthromorph Bat Parts for character customization
 2019-10-23 17:00:08 -07:00
Ghommie
62ba700c05 Ports "Avoid generating the atom colour list on the lighting object" 2019-10-23 17:09:48 +02:00
Ghommie
687d452d67 #44222, yea sorry for your rework Poojawa. 2019-10-23 16:15:26 +02:00
Ghommie
6c34a51ff4 protip: don't return datum references anymore. 2019-10-23 15:47:10 +02:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
ItzGabby
25e426ddd0 Adds new parts for anthromorphs 
Adds bat ears, bat marking, bat tails (Two variants and animation included), and new alternative snouts. Also cleans up the wing selection menu to be alphabetic, because, it was horrific to look at.
 2019-10-23 07:26:01 -04:00
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
BlackMajor
8b61fe3d72 posibrains on spawn list 2019-10-23 22:46:10 +13:00
Ghommie
93777f6703 Fixes artificier lesser magic missile. 2019-10-23 10:52:34 +02:00
kevinz000
e226a79c9b Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art 
Code stuffs + more framework for cargo rework cuz atomic prs are good
 2019-10-22 23:11:56 -07:00
YakumoChen
3d63e9aa20 throwing darts at the wall here 2019-10-23 00:50:05 +00:00
YakumoChen
b78e6f27b6 ports #43784 2019-10-23 00:18:21 +00:00
YakumoChen
1e0f31ad4a Update damage_procs.dm 2019-10-23 00:14:52 +00:00
YakumoChen
ffd160ebe8 Update pai_defense.dm 2019-10-23 00:13:00 +00:00
YakumoChen
292b997900 Update damage_procs.dm 2019-10-23 00:11:52 +00:00
YakumoChen
6d11e1bd1d Update damage_procs.dm 2019-10-23 00:08:13 +00:00
YakumoChen
13a06aa099 Update damage_procs.dm 2019-10-23 00:05:44 +00:00
YakumoChen
7d9a6d2a34 Update zombies.dm 2019-10-23 00:05:12 +00:00
YakumoChen
c5ec76e24d Update species.dm 2019-10-23 00:04:09 +00:00
YakumoChen
5b321fc821 #43784 2019-10-22 23:50:25 +00:00
YakumoChen
e76f64ce16 #43784 2019-10-22 23:49:29 +00:00
YakumoChen
884b5421a0 ports #43784 2019-10-22 23:41:43 +00:00
Feasel
9f6511c8b6 [Balance Pass] - Supermatter Mega Delam (Tesla) 
All I'm doing here is raising the power_penalty_thresholds to a higher number so that it takes more time and effort to force the mega delamination.

Also by leaving a wider gap between Severe and Critical stages, it gives more warning to AI and Engineers that Tesla delamination is happening soon.

As some of us know by now, it's /very/ easy to force Tesla delams and that uhh... it's aids to deal with due to all the effects happening so quickly as it powers through all the stages from just 3 simple switches.

It takes effort and time for Singulo delam to start happening due to the high amount of moles needed on. that. tile. 

Does not take much for Tesla. Fixing that now.
 2019-10-22 18:25:29 -05:00
nik707
10de9091ec Merge pull request #9558 from Citadel-Station-13/kevinz000-patch-102 
fixes soulstones leaving behind abstract invisibility bodies
 2019-10-22 16:50:22 -05:00
nik707
9a598a92cb Merge pull request #9561 from Ghommie/Ghommie-cit256 
Fixing some ayy overlays and client images oddities.
 2019-10-22 16:49:07 -05:00
nik707
107bb36253 Merge pull request #9566 from Citadel-Station-13/kevinz000-patch-104 
Fixes neurotoxin stunning non-carbons
 2019-10-22 16:47:53 -05:00