Commit Graph
23757 Commits
Author SHA1 Message Date
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 5463ecb6b6 Merge pull request #2207 from Markolie/fixes3
Fix passive vent icon sprite, hopefully fix tvalves
2015-09-28 03:00:40 -04:00
Fox-McCloud 6a2c7a82ff Merge pull request #2194 from tigercat2000/frunkenstien
Frankenstein
2015-09-28 02:58:44 -04:00
Markolie c5e5b3d9ab Fix passive vent icon sprite, hopefully fix tvalves 2015-09-28 08:49:12 +02:00
Fox-McCloud a9989e2252 Merge pull request #2206 from Markolie/fixes3
Fix inflatable walls
2015-09-28 01:54:28 -04:00
Markolie 699bbd0972 Compile 2015-09-28 07:46:30 +02:00
Markolie 3397ddf7c1 Fix inflatable walls 2015-09-28 07:41:24 +02:00
Fox-McCloud 0525a2a94b Merge pull request #2205 from Markolie/fixes3
Re-introduce passive vents, mixer sprite fix
2015-09-28 01:00:50 -04:00
Markolie ef6aeeb7d4 Fix mixer underlay 2015-09-28 06:47:54 +02:00
Markolie dc03998020 Fix stacking/unloading machines 2015-09-28 06:27:51 +02: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
Markolie c004e68ceb Re-introduce passive vents, mixer sprite fix 2015-09-28 05:53:51 +02:00
Fox-McCloud f33a77d067 Merge pull request #2203 from Markolie/fixes3
Fixes
2015-09-27 23:23:50 -04:00
Markolie dbbdf90670 Add missing c200 cash sprite 2015-09-28 05:03:19 +02:00
TheDZD 1a4ab9b842 Merge pull request #2191 from Markolie/fixes3
Fixes
2015-09-27 21:39:32 -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
Fox-McCloud d7f23f4271 Oh, that kind of list 2015-09-27 19:39:09 -04:00
Markolie 219640c02a Loose pipe 2015-09-28 01:24:50 +02:00
Fox-McCloud 155afc6131 lists 2015-09-27 19:24:35 -04: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
Mark van Alphen eb1739afd9 Merge pull request #2178 from tigercat2000/heart-tg-
Pixel-coords laserpointer
2015-09-28 00:24:41 +02:00
Mark van Alphen 5993019e32 Merge pull request #2181 from Robertha89/patch-1
Death Alarm Implant Kit change
2015-09-28 00:24:32 +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
Fox-McCloud 569758f4cb bluespace trashbag 2015-09-27 06:46:50 -04:00
Fox-McCloud d743fb1d1a pda janitor cart fixup 2015-09-27 04:48:04 -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 a47b86e3c5 Whoops, add return 2015-09-27 08:48:43 +02:00
Markolie bcc3f2483a Prevent shadowlings from hatching in lockers 2015-09-27 08:43:08 +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 c1952dc976 Fix unpowered outlet injectors 2015-09-27 07:46:52 +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 4bf3bb9c31 Remove redundant check 2015-09-27 06:32:17 +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 f5f27fa186 Atmos analyzer update 2015-09-27 04:48:42 +02:00
Markolie ee130ccbbe Pipe fixes 2015-09-27 04:15:57 +02:00