Commit Graph

12349 Commits

Author SHA1 Message Date
kevinz000 25efd11d9a Update code/modules/projectiles/projectile/energy/stun.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-11-20 21:44:17 -07:00
Fermi b911fabb37 Okay bedtime 2019-11-21 04:25:25 +00:00
Fermi 18e1246fd0 Classic fixes 2019-11-21 03:16:18 +00:00
Putnam c40cad1658 Starting an explosion rework, fun fun 2019-11-20 19:01:59 -08:00
Fermi cc53a0061f Well it compiles 2019-11-21 02:15:58 +00:00
Fermi bfb5f75016 Finishing up final UI adjustments 2019-11-20 21:23:54 +00:00
kevinz000 ab846bc584 Update stun.dm 2019-11-20 13:54:57 -07:00
Ghommie 920eba0b03 ayy 2019-11-20 21:41:59 +01:00
Ghommie aab7ad192b Martial arts pacifism fixes and boxing buff, more ported pacifist fixes. 2019-11-20 21:00:17 +01:00
Ghommie ac44bfcad2 chem dispenser beakers and bikehorn fixes. 2019-11-20 17:55:11 +01:00
loginsandylogout 5395e0c893 meme 2019-11-20 10:35:40 -06:00
Useroth b91d0e27da An alternative solution to the problems with blackpowder. 2019-11-20 15:49:04 +01:00
Useroth 2a8152c835 Applied suggestions. 2019-11-20 15:15:10 +01:00
Thalpy ebe3859cc5 syncs size 2019-11-20 13:28:35 +00:00
Fermi 4dd8223634 Undoes circuitboards and converts to sleeper. 2019-11-20 11:58:06 +00:00
Fermi 48e1c64c8d Final 2019-11-20 11:35:40 +00:00
TrilbySpaceClone a3aa70be75 Tweaks, and such
Tweaks many cargo packs, and fixes a few issues
Sneak peak into the kilm as well
2019-11-20 06:02:06 -05:00
Putnam 0d297e92c7 read words 2019-11-19 22:02:06 -08:00
Putnam f7361c2059 Made sure every dynamic-controlled event doesn't randomly trigger on dynamic. 2019-11-19 21:58:55 -08:00
Ghommie 75ac087988 Unmodularize pAI holo-chassis icons. 2019-11-20 05:54:00 +01:00
kevinz000 20bcca0398 Merge pull request #9852 from Ghommie/Ghommie-cit369
Fixing some wizard den teleportation issues.
2019-11-19 21:39:20 -07:00
kevinz000 67abc4ff03 Merge pull request #9855 from Ghommie/Ghommie-cit371
Fixing suit store overlays
2019-11-19 21:38:22 -07:00
kevinz000 c1a416e257 Merge pull request #9858 from Ghommie/Ghommie-cit372
Fixing gasping xenos.
2019-11-19 21:37:17 -07:00
kevinz000 d692d3fe01 Merge pull request #9835 from Ghommie/Ghommie-cit363
Ports "Self sustaining fix"
2019-11-19 21:32:57 -07:00
kevinz000 755559bb66 Merge pull request #9836 from Ghommie/Ghommie-cit364
Ports "Uses defines for turf atmos"
2019-11-19 21:32:42 -07:00
kevinz000 a012347c52 Merge pull request #9837 from Ghommie/Ghommie-cit365
Ports "Fixes an Ancient LINDA Bug"
2019-11-19 21:32:23 -07:00
kevinz000 9e5f697838 Merge pull request #9842 from NopemanMcHalt/dab-op-plus
Fixes D.A.B. loadout name
2019-11-19 21:31:47 -07:00
kevinz000 c7765a032b Merge pull request #9844 from Putnam3145/dynamic-midround-wizard-tweak
Dynamic summon events tweaks
2019-11-19 21:31:14 -07:00
kevinz000 4d1a9a0773 Merge pull request #9816 from Ghommie/Ghommie-cit356
Ports "Fixes MMIs not being able to use mecha equipment"
2019-11-19 21:30:13 -07:00
kevinz000 a2f85cd19d Merge pull request #9819 from Ghommie/Ghommie-cit358
Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor.
2019-11-19 21:29:30 -07:00
kevinz000 877b79ae1c Merge pull request #9822 from Putnam3145/dynamic-wizard-rework
Reworked how wizard spells interact with dynamic
2019-11-19 21:29:09 -07:00
kevinz000 f883f55391 Merge pull request #9818 from GrayRachnid/portssaboteur
Ports the Saboteur borg for nukeops and new cyborg tools/weapon icons.
2019-11-19 21:28:25 -07:00
Ghommie b78da82336 Honkbot slip and slide fun ride. 2019-11-20 04:03:57 +01:00
Ghommie 7c0c14e059 Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit 2019-11-20 03:35:06 +01:00
Knouli 592c952d64 Update regenerative_core.dm 2019-11-19 20:03:04 -05:00
Hatterhat f161b01f6b ayytech plants 2019-11-19 17:26:44 -06:00
Ghommie c21a137a62 Fixes super-lube waterflower. 2019-11-19 22:56:29 +01:00
Useroth 5169205a19 Added a 10pack as well 2019-11-19 19:35:37 +01:00
Ghommie 21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Useroth 24bd42fc80 Adds strange seeds as a buyable traitor botanist item. 2019-11-19 19:19:40 +01:00
Ghommie dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Thalpy bf89df7e7b Fixing things 2019-11-19 16:03:33 +00:00
Thalpy c0287cf7b5 Reagent sleepers! 2019-11-19 14:50:22 +00:00
Fermi 9fb6c2f3a3 Okay I gotta hop 2019-11-19 12:22:53 +00:00
Knouli a6d4e7edef Update regenerative_core.dm 2019-11-19 06:00:56 -05:00
BlackMajor 1b1ed21f42 No adrenals for borgs please 2019-11-19 22:13:22 +13:00
kevinz000 40a01dedfe Merge pull request #9806 from BlackMajor/Yote
Borg changes. Compresses Service/Janitor/Scrubpuppy borgs together. Removes borgi. Adds vore sleepers to service and engi dogborgs. Demodularizes some dogborg stuff too.
2019-11-19 01:54:47 -07:00
BlackMajor 6cdb54bef1 Fix service borg lights breaking 2019-11-19 21:29:05 +13:00
BlackMajor 31c59b7cad fixes upgrades removing dogborg stuff 2019-11-19 20:50:59 +13:00
Linzolle f9b632019b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-18 21:39:45 -06:00