b240956c4c
Okay, just peace vs chaos.
2019-11-06 00:21:47 -08:00
c354b17afe
Also deobfuscates dynamic vote
2019-11-06 00:13:39 -08:00
401bbbd8ab
Reduced vote to just extended vs calm vs chaos.
2019-11-06 00:07:52 -08:00
bb9b0ce312
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
2019-10-24 22:38:33 -07:00
4af2233c5f
Merge pull request #9549 from Ghommie/Ghommie-cit252
...
Fixes identity transfer not copying digi legs.
2019-10-24 19:15:33 -07:00
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
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
9096f03ad3
Merge pull request #8654 from Ghommie/Ghommie-cit54
...
ports in the Hilbert's Hotel.
2019-10-24 19:07:33 -07:00
da502aa31d
Merge pull request #9535 from Ghommie/Ghommie-cit247
...
Fixing sniper rifles scope datum action oddity.
2019-10-24 19:05:25 -07:00
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
236cf328d1
Merge pull request #9567 from BlackMajor/Yote
...
Clockwork golems can now use guns
2019-10-24 19:03:49 -07:00
281b254066
Merge pull request #9594 from Hatterhat/patch-3
...
Shoes can now hold all pistols
2019-10-24 18:56:59 -07:00
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
d5041b7dde
Merge pull request #9582 from Putnam3145/dynamic-config
...
Adding dynamic rules to the game config
2019-10-24 18:55:29 -07:00
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
d8fc3e7211
Merge pull request #9564 from kappa-sama/aliumtators
...
The syndicate are led by aliens.
2019-10-24 18:49:48 -07:00
02a1aaea34
Merge pull request #9548 from Ghommie/Ghommie-cit251
...
Fixing radio emotes conflict with drunk memes.
2019-10-24 18:48:33 -07:00
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
4b2b3a26b3
Merge pull request #9577 from Feasel/patch-1
...
[Balance Pass] - Supermatter Mega Delam (Tesla)
2019-10-24 18:47:29 -07:00
d0e9f63734
Merge pull request #9585 from Ghommie/Ghommie-cit257
...
Fixes artificier lesser magic missile.
2019-10-24 18:46:27 -07:00
969bc83179
Merge pull request #9586 from BlackMajor/Yeehaw
...
Adds posibrains to the spawners menu for ghosts.
2019-10-24 18:45:57 -07:00
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
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
7b257242c2
bullets won't work...
2019-10-24 10:44:57 +02:00
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
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
3e9dfd6441
i was suggested to try this
2019-10-24 02:59:15 +00:00
c6939864c1
and this
2019-10-24 02:42:38 +00:00
5a9f0aa1e4
this too
2019-10-24 02:33:48 +00:00
3ec63ed12d
I think I forgot this
2019-10-24 02:32:21 +00:00
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
f85f110baa
Merge pull request #9047 from Poojawa/syntheticbloods
...
RGB Blood Reworks + Blood generator
2019-10-23 20:54:55 -04:00
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
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
770cd97d70
AYE FUCK IT SHOE PISTOL ANARCHY
2019-10-23 18:48:00 -05:00
452658b16c
Code improvement.
2019-10-23 21:26:43 +02:00
0e6033a576
Fixing gulag teleporter stripping the user of stuff it really shouldn't.
2019-10-23 21:21:05 +02:00
62ba700c05
Ports "Avoid generating the atom colour list on the lighting object"
2019-10-23 17:09:48 +02:00
687d452d67
#44222 , yea sorry for your rework Poojawa.
2019-10-23 16:15:26 +02:00
6c34a51ff4
protip: don't return datum references anymore.
2019-10-23 15:47:10 +02:00
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
ba307b01a5
Defib fixes and chem effects stuff
2019-10-23 13:45:57 +02:00
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
fc1f10c97f
Porting components updates and fixing phantom thief component.
2019-10-23 13:01:31 +02:00
8b61fe3d72
posibrains on spawn list
2019-10-23 22:46:10 +13:00
7050ec281d
wow do NOT want those
2019-10-23 02:14:03 -07:00
93777f6703
Fixes artificier lesser magic missile.
2019-10-23 10:52:34 +02:00
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
67662d1d69
everything works now
2019-10-22 21:39:28 -07:00
9dd4d6a93c
silly errors
2019-10-22 20:07:26 -07:00
Putnam