Commit Graph

13438 Commits

Author SHA1 Message Date
Fox-McCloud 3ec20a2313 Merge pull request #2208 from Markolie/fixes3
Fixes
2015-09-28 16:32:11 -04:00
Tigercat2000 ec2b31e435 Nuke wheelchair snowflake shit, fix the delay 2015-09-28 12:59:44 -07:00
Markolie 8e37513502 Make sure all departments can still sync with R&D 2015-09-28 20:39:30 +02:00
Markolie 2c7d6f1a1b Law manager now only requires the host to be conscious 2015-09-28 18:25:50 +02:00
Fox-McCloud 933ffcd7d0 Merge pull request #2197 from Markolie/stickyban
Add in-game stickyban interface
2015-09-28 03:20:37 -04:00
Fox-McCloud 6a2c7a82ff Merge pull request #2194 from tigercat2000/frunkenstien
Frankenstein
2015-09-28 02:58:44 -04:00
Fox-McCloud 7546716cff Merge pull request #2193 from Markolie/spacecube
Removes the space cube, implements the round-randomized torus space map
2015-09-28 00:04:57 -04:00
Markolie 4bcb5d0eb2 Add sorting to stickyban list 2015-09-28 05:58:00 +02:00
Aurorablade 4e64deb560 Revert "Revert "Nomnomnomnom""
This reverts commit 0239b80e27.
2015-09-27 22:41:44 -04:00
Markolie f69beaeb00 Drone fix, runtime fixes 2015-09-28 03:34:33 +02:00
Markolie f7fe8c8c6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes3
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-09-28 03:05:04 +02:00
Mark van Alphen 48a3d1ab9a Merge pull request #2176 from Fox-McCloud/janicarts-and-janitors
Janicart and Janitor Update
2015-09-28 03:02:04 +02:00
Markolie 6b7d8914d9 Admin messaging for proc calls 2015-09-28 01:44:18 +02:00
Markolie 273bcb07e5 Add vial box to virology, in view() update 2015-09-28 01:18:04 +02:00
Markolie 1952d15699 Space fix 2015-09-28 00:44:07 +02:00
Mark van Alphen d3ff9f50ed Merge pull request #2184 from Spacemanspark/master
Gives a special *deathgasp text to IPC's.
2015-09-28 00:27:19 +02:00
Markolie bd65300965 Formatting update, make sure that reload admins remove proccall verbs 2015-09-28 00:22:35 +02:00
Markolie 44763a869a Stickyban clean-up, add admin bans 2015-09-27 23:58:10 +02:00
Markolie b914544a87 Fixes 2015-09-27 22:50:09 +02:00
Markolie 6f2a753d89 Send questions to admins and mods 2015-09-27 21:38:08 +02:00
DZD 0ceaf664af Fix merge conflicts 2015-09-27 11:24:51 -04:00
Fox-McCloud 569758f4cb bluespace trashbag 2015-09-27 06:46:50 -04:00
Markolie 84f1c2ab8f Re-add ban appeal message, memo check 2015-09-27 09:08:10 +02:00
Markolie 1b14817889 Add in-game stickyban interface 2015-09-27 09:02:58 +02:00
Markolie efbf5f50f0 Make sure sprites update on login 2015-09-27 08:38:21 +02:00
Tigercat2000 a9af8b1532 Frankenstein
This commit does the following
 - Organs are no longer reliant on the species and DNA of their attached
   owner. Whoever made the organs (ex a spawned mob) transfers their
   species and DNA to the organ, and it uses that for calculations.
  - You may now attach organs cross-species; Yes, this means sticking
    skrell heads onto humans to make tentacle monsters. Or something.
 - IPC's may now choose their frame color.
  - I did say elsewhere this was not feasible; However, after taking a few
    hours to learn the systems behind all of it, I managed to hack
    something together. It's snowflakey, but fuck it, it doesn't need to
    be not-snowflakey.
2015-09-26 23:24:52 -07:00
Markolie f63abafd2b Make robot components start powered 2015-09-27 08:21:07 +02:00
Markolie 24c503d738 Remove unnecessary logging from law procs 2015-09-27 07:52:02 +02:00
Markolie 0b030a63bd Remove spaces from module files 2015-09-27 07:32:07 +02:00
Markolie 75c7cf165a R&D fixes 2015-09-27 06:58:55 +02:00
Markolie 24150330cf Removes the space cube, implements the round-randomized torus space map 2015-09-27 06:02:45 +02:00
Markolie fe20808108 Dead people can't emote 2015-09-27 05:03:05 +02:00
Markolie ea438c62c7 Let mentors de-admin again 2015-09-27 03:20:34 +02:00
Markolie 91eaf81a08 Fix 2015-09-27 03:18:05 +02:00
Markolie 6e19e36d9b More admin logging 2015-09-27 03:07:06 +02:00
Fox-McCloud b7680a4dfe Merge pull request #2188 from Markolie/master
Experimentor log fix
2015-09-26 18:43:15 -04:00
Markolie 0034a8a116 Experimentor log fix 2015-09-27 00:20:42 +02:00
Mark van Alphen 9c68c2baaf Merge pull request #2175 from Fox-McCloud/fixup
Spacemove Fixup
2015-09-26 23:53:50 +02:00
Fox-McCloud 821d2d0309 Merge pull request #2167 from Markolie/SDQL
Add SDQL, +PROCCALL, admin updates
2015-09-26 17:40:03 -04:00
Mark van Alphen 1e9cce8f49 Merge pull request #2169 from Fox-McCloud/pick-your-poison
Toxin Tweak
2015-09-26 23:36:20 +02:00
Spacemanspark 1ac203fb3d Gives the IPC *deathgasp a bit more flavor.
Delicious.
2015-09-26 16:06:17 -05:00
Spacemanspark 77bf9cb73d Gives a special *deathgasp text to IPC's. 2015-09-26 15:27:06 -05:00
Fox-McCloud ae38db0bd8 Merge pull request #2172 from Markolie/zefixes
Various fixes
2015-09-26 16:25:22 -04:00
Mark van Alphen 6f9ce5d65c Merge pull request #2164 from Fox-McCloud/gas-turbine
Gas Turbine
2015-09-26 21:27:11 +02:00
TheDZD b30b93c551 Merge pull request #2182 from tigercat2000/FUCKINGBEES
fix infinite loop by nuking that entire shit loop
2015-09-26 13:54:43 -04:00
Tigercat2000 82308c2499 fix infinite loop by nuking that entire shit loop 2015-09-26 10:48:48 -07:00
Tigercat2000 c50781a743 Fix blank-text bug, with an angry comment. 2015-09-26 10:08:04 -07:00
Fox-McCloud 4413911688 Janicart and Janitor Update 2015-09-26 06:17:29 -04:00
Fox-McCloud d57d42e8dd Spacemove Fixup 2015-09-26 02:36:44 -04:00
Markolie 954377faa0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql 2015-09-26 05:20:20 +02:00