Commit Graph

10351 Commits

Author SHA1 Message Date
Ghommie 514b023779 kev request: admin ooc is no bigger. 2019-10-25 12:30:05 +02: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
kevinz000 9fd3ef7801 Merge branch 'magrifles_again' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into magrifles_again 2019-10-24 18:36:04 -07:00
Ghommie ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02:00
kevinz000 31f9ed9665 fixes 2019-10-24 15:31:45 -07:00
Ghommie 6fbe7f9086 unmodularize events 2019-10-24 23:41:31 +02:00
Ghommie 6f19899dd2 Unmodularize research. 2019-10-24 23:28:15 +02:00
Ghommie 0da6ae549f Unmodularize vox sounds 2019-10-24 23:02:21 +02:00
Ghommie f035d77b53 Slips. 2019-10-24 22:50:53 +02:00
Ghommie 2a07bf95d8 Unmodularize job types 2019-10-24 22:44:40 +02:00
Ghommie f01b5c853f Unmodularize lavaknights. 2019-10-24 22:08:36 +02:00
Ghommie da03439ac8 Ports "New Revenant icons" 2019-10-24 12:21:37 +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
deathride58 0ae8953da9 various runtime fixes - plasman tounges no longer have a maxhealth value of "alien", simplemobs no longer runtime when shot, removing filters from something that lacks filters now works 2019-10-24 02:52:40 -04: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
kevinz000 9d78d8a259 Merge branch 'master' into magrifles_again 2019-10-23 17:57:19 -07: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 20d9adaccd Floaty floating. 2019-10-23 20:43:05 +02:00
Ghommie a95b13c24a jetpack fixes too & co 2019-10-23 19:31:54 +02:00
Ghommie c882c098cc Porting movespeed modification system updates. 2019-10-23 19:24:34 +02:00
Ghommie 62ba700c05 Ports "Avoid generating the atom colour list on the lighting object" 2019-10-23 17:09:48 +02:00
Ghommie 7da46cef75 Ports "All font size spans scale" and cleans up the many browserOutput CSS 2019-10-23 16:41:13 +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