Commit Graph

6085 Commits

Author SHA1 Message Date
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 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 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
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
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 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
Ghommie dac6fef57a Also implementing /tg/station pr #40767 2019-10-09 00:38:09 +02:00
Ghommie 9ee1987dec Applying kevinz' ominous warning suggestion 2019-10-08 20:04:08 +02:00
Sishen 363303747a Update neovgre.dm 2019-10-08 10:27:48 -04:00
Poojawa d7ab97dffc does some of the television's demands 2019-10-08 04:02:20 -05:00
lolman360 04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00
Poojawa 3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
GrayRachnid 9f8ad74bf9 New traumas and some other things. 2019-10-08 03:53:01 -04:00
kevinz000 fe1a78f413 Merge pull request #9421 from Ghommie/Ghommie-cit218
Porting some spraycan fixes and tweaks.
2019-10-08 00:34:58 -07:00
kevinz000 abef83f56e Merge pull request #9427 from Ghommie/Ghommie-cit219
Skeleton and zombie tweaks/balance (featuring "makes halloween skeletons not the overpowered pirate ones")
2019-10-08 00:34:33 -07:00
kevinz000 143e8c4186 Merge pull request #9404 from Poojawa/qm-is-a-head
QM is a head of staff, Cargo ID Console added
2019-10-08 00:34:07 -07:00
kevinz000 8aacedaefa Merge pull request #9316 from Thalpy/Reagents_bitflats
[READY] [FermiChem] Turns reaction vars into bitflags and adds a few new procs related to that.
2019-10-08 00:33:21 -07:00
kevinz000 06e312b208 Merge pull request #9032 from Ghommie/Ghommie-cit178
Ports plasmaman departmental envirosuits and tweaks.
2019-10-08 00:28:06 -07:00
kevinz000 76ede7a473 Merge pull request #9406 from Poojawa/carpet-colors
More Carpet colors and liquid carpet varients
2019-10-07 23:39:52 -07:00
kevinz000 dcb37bfd0e Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2019-10-07 23:36:11 -07:00
Thalpy 564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01:00
kevinz000 0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
2019-10-07 23:29:19 -07:00
Sishen 77f3b22df5 Update neovgre.dm 2019-10-07 21:53:34 -04:00
nik707 de117afd8b Merge pull request #9410 from Poojawa/cryopod-tweaks
Fixes Cryopod quirks, makes the menu not complete shit
2019-10-07 18:24:38 -05:00
Linzolle 4bdd38b422 i feel like this is a really stupid way to fix it 2019-10-07 16:17:42 -05:00
Ghommie 99e9280eaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178 2019-10-07 21:41:04 +02:00
Ghommie 159d2a188d peeve. 2019-10-07 17:38:36 +02:00
Ghommie b95f910a4e macros 2019-10-07 17:32:16 +02:00
Ghommie 5232728ee7 Ports "Adds three new .38 ammo types", also lazily adding .357 AP 2019-10-07 05:25:47 +02:00
Ghommie 31a6979c3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-10-06 21:54:15 +02:00
Ghommie a1a3bbe99f Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones") 2019-10-06 19:16:13 +02:00
Poojawa ee5155bdbb fixes oddities 2019-10-06 04:27:46 -05:00
Ghommie f01f00710f Porting some spraycan fixes. 2019-10-06 05:30:16 +02:00
Thalpy 27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
Ghommie cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-05 22:03:37 +02:00
Ghommie 32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-10-05 18:22:43 +02:00
Trilbyspaceclone f43bd91072 Merge branch 'master' into A_Tailer's_art 2019-10-05 11:50:12 -04:00
kevinz000 a923ea984a Merge pull request #9388 from Sishen1542/dynamicadminfix
Dynamic now auto-deadmin friendly
2019-10-05 08:22:47 -07:00
Ghommie 3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
Ghommie 52fb4b03ac we are only keeping track of the number of singu beacons, var more efficient. 2019-10-05 05:29:57 +02:00
Ghommie 35a6991300 lone rogue parenthesis 2019-10-05 05:14:38 +02:00
Ghommie d706944e20 The niche singularity beacon now also moderately buffs meteor waves. 2019-10-05 04:37:01 +02:00
Poojawa 9d2d84f53d Update table_frames.dm 2019-10-04 15:49:25 -05:00
Poojawa 35d33b4f3b mob_occupant 2019-10-04 10:05:08 -05:00
Poojawa cda97faaa5 UI and proper deletion stuff 2019-10-04 09:52:42 -05:00