Commit Graph

17225 Commits

Author SHA1 Message Date
Ghommie
e734b36ee3 quickfixes lowpop nuclear war tc malus calculation. 2019-10-10 20:54:19 +02:00
Winter Flare
2bce423ec3 Added a -ton- of stuff to the Kinkmate 2019-10-10 14:08:14 -04:00
Dap
293034d815 Imagine Updating How Tables Work, But Forgetting MY TABLES
## About The Pull Request

Let me just add in a single line so plasmaglass tables actually work.

## Changelog
🆑
fix: You can now make plasmaglass tables again.
/🆑
2019-10-10 09:04:06 -06: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
0f74a735cb Merge pull request #9412 from Ghommie/Ghommie-cit213
Ports "Makes supermatter melt walls if it finds itself in one"
2019-10-10 02:21:32 -07:00
kevinz000
d9ff4235eb Merge pull request #9447 from Ghommie/Ghommie-cit223
No digitigrade plasmaman suits sprites for the time being, thank you.
2019-10-10 02:20:45 -07:00
kevinz000
fda64df569 Merge pull request #9257 from Thalpy/Blind-quirk-without-anger
[READY] Blind quirk without anger
2019-10-10 02:19:17 -07:00
kevinz000
89747a3a6e Merge pull request #9368 from Seris02/master
Fixes luminescent dark blue major effect and changes the "autoprocess" button to "autoclone"
2019-10-10 02:18:25 -07:00
kevinz000
6e029c3360 Merge pull request #9415 from Ghommie/Ghommie-cit214
Removes the minimum player cap for the war ops in favour or a more proportional telecrystal bonus.
2019-10-10 02:13:25 -07:00
kevinz000
fb028b7997 Merge pull request #9432 from Putnam3145/pandemic-qol
Made PanD.E.M.I.C beaker stuff more like ChemMaster
2019-10-10 02:12:41 -07:00
kevinz000
f791b399a0 Merge pull request #9446 from Sishen1542/ung
abscond can no longer be cast from inside a locker
2019-10-10 02:11:17 -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
236dcc4d63 Merge pull request #9452 from Ghommie/Ghommie-cit225
Stops non-alphanumeric graffiti decals from being named "letter".
2019-10-10 02:10:08 -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
Thalpy
41946dd9cf Updates icons 2019-10-10 09:27:15 +01:00
Thalpy
348f6a4db4 Fixes Icons 2019-10-10 07:36:44 +01:00
Thalpy
eaa84418c9 Fixes compile errors 2019-10-10 07:17:22 +01:00
Ghommie
689136fe94 Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler. 2019-10-09 23:07:39 +02:00
Fermi
8f9622cbe2 Well lets try it 2019-10-09 18:01:09 +01:00
Fermi
53e8d64388 Ah I see now 2019-10-09 17:51:14 +01:00
Ghommie
2ac24b2ac6 Fixing head rev blebs 2019-10-09 18:18:49 +02:00
Fermi
746a656c27 Merge branch 'master' into Spookytime 2019-10-09 16:44:39 +01:00
Fermi
35fe28ce43 oof 2019-10-09 16:40:55 +01:00
Fermi
8a7f27803c Maybe 2019-10-09 16:40:01 +01:00
Fermi
c4ac815598 Oof 2019-10-09 16:35:20 +01:00
Fermi
3eea5310c9 Ugh 2019-10-09 16:32:55 +01:00
Fermi
b023671db4 Damnit Jaqc 2019-10-09 16:22:09 +01:00
Fermi
146e0aae29 Crashes make me sad 2019-10-09 15:03:04 +01:00
Fermi
b34f648e60 Adds landmarks. 2019-10-09 13:57:19 +01:00
Fermi
b19c078447 Restructuring. 2019-10-09 12:09:41 +01:00
Fermi
1dce18962d Jaqc complete. 2019-10-09 11:58:36 +01:00
Thalpy
8909b0f6c3 Merge branch 'master' into Updates-holder 2019-10-09 09:01:09 +01:00
Fermi
9071826e70 I can't focus 2019-10-09 08:34:16 +01:00
Fermi
89d3a0534c Tweaker 2019-10-09 07:53:20 +01:00
Ghommie
ac0b3629f1 roundstart quitters 2019-10-09 07:53:59 +02:00
Fermi
ad0f34cdf8 Tweaks wiki a lil 2019-10-09 06:04:06 +01:00
Ghommie
b4e975ef75 mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes. 2019-10-09 06:51:07 +02:00
Fermi
f5bc825ef0 Merge branch 'Wiki-fermi' into Updates-holder 2019-10-09 05:35:05 +01:00
lolman360
c694cb8652 h 2019-10-09 13:35:23 +11:00
lolman360
645b8ddf39 cmo: the new CE
loot him for tools
2019-10-09 13:32:45 +11:00
Ghommie
cfccacafbf Stops all graffiti decals from being named "letter". 2019-10-09 01:54:38 +02:00
Ghommie
50ad5f269b unrandomizes mind names. 2019-10-09 01:30:31 +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
Trilbyspaceclone
1ccf95462a Update costumes_toys.dm 2019-10-08 19:07:02 -04:00
Trilbyspaceclone
0a878c17bc readds carpet 2019-10-08 18:51:58 -04:00
Trilbyspaceclone
e4a2c21b8c Merge branch 'master' into Cargo_rebalance 2019-10-08 18:49:38 -04:00
Ghommie
dac6fef57a Also implementing /tg/station pr #40767 2019-10-09 00:38:09 +02:00
Ghommie
9c3e532be7 Fixes lack of arguments on mobs' can_equip. 2019-10-09 00:21:55 +02:00
JTGSZ
2cd7f8f8ce More control over species based offsets 2019-10-08 17:03:51 -04:00