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

25018 Commits

This Branch
This Branch
All Branches
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
kevinz000
c37088a767 Merge pull request #9609 from BlackMajor/master 
Fixes hilbert hotel sometimes creating a chain reaction that obliterates reality.
 2019-10-25 03:18:18 -07:00
BlackMajor
885b866130 Merge pull request #15 from BlackMajor/BlackMajor-patch-1 
Fixes hilbert hotel starting a chain reaction that obliterates reality sometimes.
 2019-10-25 23:03:15 +13:00
BlackMajor
1705765555 Update hilbertshotel.dm 2019-10-25 23:02:09 +13:00
BlackMajor
2c4cb6f2c4 Merge pull request #14 from Citadel-Station-13/master 
Update base
 2019-10-25 23:00:58 +13:00
CitadelStationBot
e55cb64b78 Automatic changelog generation for PR #9549 [ci skip] 2019-10-24 21:15:39 -05:00
kevinz000
4af2233c5f Merge pull request #9549 from Ghommie/Ghommie-cit252 
Fixes identity transfer not copying digi legs.
 2019-10-24 19:15:33 -07:00
CitadelStationBot
cc0162b5a9 Automatic changelog generation for PR #9579 [ci skip] 2019-10-24 21:13:56 -05: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
CitadelStationBot
e87997d753 Automatic changelog generation for PR #9593 [ci skip] 2019-10-24 21:10:19 -05:00
kevinz000
7beb00abba Merge pull request #9593 from Ghommie/Ghommie-cit263 
Fixing gulag teleporter stripping the user of stuff it really shouldn't.
 2019-10-24 19:10:17 -07:00
CitadelStationBot
30d201ee3a Automatic changelog generation for PR #8654 [ci skip] 2019-10-24 21:07:35 -05: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
CitadelStationBot
cea6728e9e Automatic changelog generation for PR #9535 [ci skip] 2019-10-24 21:05:27 -05: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
CitadelStationBot
debe707432 Automatic changelog generation for PR #9568 [ci skip] 2019-10-24 21:04:17 -05: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
CitadelStationBot
d301aa1b70 Automatic changelog generation for PR #9594 [ci skip] 2019-10-24 20:57:01 -05:00
kevinz000
281b254066 Merge pull request #9594 from Hatterhat/patch-3 
Shoes can now hold all pistols
 2019-10-24 18:56:59 -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
CitadelStationBot
8c5293b8b0 Automatic changelog generation for PR #9582 [ci skip] 2019-10-24 20:55:32 -05:00
kevinz000
d5041b7dde Merge pull request #9582 from Putnam3145/dynamic-config 
Adding dynamic rules to the game config
 2019-10-24 18:55:29 -07:00
CitadelStationBot
5015a320c6 Automatic changelog generation for PR #9542 [ci skip] 2019-10-24 20:51:36 -05: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
CitadelStationBot
ca38a6d606 Automatic changelog generation for PR #9564 [ci skip] 2019-10-24 20:49:50 -05: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
CitadelStationBot
c0ae552b45 Automatic changelog generation for PR #9548 [ci skip] 2019-10-24 20:48:35 -05: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
CitadelStationBot
dec1dd41c0 Automatic changelog generation for PR #9550 [ci skip] 2019-10-24 20:48:11 -05: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
CitadelStationBot
59c9972e5e Automatic changelog generation for PR #9585 [ci skip] 2019-10-24 20:46:29 -05: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
BlackMajor
16998d8814 Merge pull request #9193 from Citadel-Station-13/kevinz000-patch-77 
Disables crit_threshold changes through mood
 2019-10-25 14:38:51 +13:00
CitadelStationBot
29d464b3a2 Automatic changelog generation for PR #9587 [ci skip] 2019-10-24 20:38:41 -05: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
CitadelStationBot
05516aad97 Automatic changelog generation for PR #9589 [ci skip] 2019-10-24 20:38:18 -05:00
kevinz000
f9120ed9e1 Merge pull request #9589 from Ghommie/Ghommie-cit259 
Porting GetComponent macros removal, and few other updates.
 2019-10-24 18:38:15 -07:00
Ghommie
7b257242c2 bullets won't work... 2019-10-24 10:44:57 +02: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
CitadelStationBot
7011533bb7 Automatic changelog generation for PR #9595 [ci skip] 2019-10-23 20:28:40 -05:00
nik707
dbbadde135 Merge pull request #9595 from deathride58/examinestringfix 
Fixes examine strings not properly showing blood-stained status of items
 2019-10-23 20:28:38 -05:00
deathride58
724e4305e1 Fixes examinetext of mobs not actually showing when items are bloodstained by making get_examine_name() properly take blood-stained status into account 2019-10-23 21:08:59 -04:00