Fox-McCloud
62fb3c2981
Safe Cleanup and Fix
2015-09-29 11:31:57 -04:00
Markolie
dbbdf90670
Add missing c200 cash sprite
2015-09-28 05:03:19 +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
Fox-McCloud
d7f23f4271
Oh, that kind of list
2015-09-27 19:39:09 -04:00
Fox-McCloud
155afc6131
lists
2015-09-27 19:24:35 -04: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
b914544a87
Fixes
2015-09-27 22:50:09 +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
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
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
Markolie
69f71268b8
Stop AI's from going into transit tubes
2015-09-27 03:38:22 +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
469295e791
Merge pull request #2183 from Markolie/zefixes
...
Changeling language fix, additional logging
2015-09-26 17:40:46 -04:00
Markolie
1011d57321
Changeling language fix, additional logging
2015-09-26 22:27:36 +02: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
Robertha89
495a5bfe31
Death Alarm Implant Kit change
...
Add's a sixth implant, and removes the implantpad, as it is not needed for deathimplants.
2015-09-26 19:29:48 +02:00
Tigercat2000
7e843d6a4b
Pixel-coords laserpointer
2015-09-26 08:45:43 -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
d4e5149389
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fluff
...
Conflicts:
code/modules/mob/living/silicon/robot/drone/drone.dm
2015-09-26 05:12:52 +02:00
Mark van Alphen
e07aa046e9
Merge pull request #2171 from tigercat2000/muh_tg_spessmove
...
-tg- spacemove system
2015-09-26 05:07:32 +02:00
Mark van Alphen
0a45b0cce3
Merge pull request #2160 from tigercat2000/bucklieng
...
-tg- buckling system
2015-09-26 05:07:26 +02:00
Fox-McCloud
fb2109578f
Merge remote-tracking branch 'upstream/master' into gas-turbine
2015-09-25 23:03:55 -04:00
Mark van Alphen
1da3f4deaa
Merge pull request #2153 from Fox-McCloud/virology-remap
...
Virology and Science Maintenance Remap
2015-09-26 05:00:49 +02:00
Markolie
5c85fe51ab
Update do not preserve list
2015-09-26 04:59:18 +02:00
Markolie
95fa836d68
Various fixes
2015-09-26 04:51:36 +02:00
Tigercat2000
4b6a3ddcb6
-tg- SpaceMove update
...
This commit updates the spacemove system to -tg-'s; All objects now drift
in space, not just mobs. A few hardcoded space checks have been replaced
with has_gravity(); So it applies to zero-G as well as space.
Spacepods no longer drift, because their snowflakey shitcode just doesn't
work. So they just move.
2015-09-25 15:53:59 -07:00
Tigercat2000
26bc8dff8b
Merge remote-tracking branch 'origin/bucklieng' into muh_tg_spessmove
2015-09-25 12:05:42 -07:00
Fox-McCloud
d5a6959c27
Gas Turbine
2015-09-25 05:23:05 -04:00
Fox-McCloud
1bcceb0b26
viro and sci maintenance
2015-09-25 02:07:49 -04:00
Markolie
e96103a02b
Fluff item clean-up
2015-09-25 04:31:30 +02:00
Crazylemon
66cf95be48
Used apply_effect for all radiation effects
2015-09-24 16:08:59 -07:00
Tigercat2000
58a6c9d25b
Merge remote-tracking branch 'upstream/master' into bucklieng
2015-09-24 15:53:53 -07:00
Tigercat2000
4f3938d68b
-tg- buckling system
...
This commit overhauls a bunch of systems so that buckling works for
any subtype of /obj. This means that space vines and chairs and beds all
use the same system. A lot of stuff has been touched.
2015-09-24 15:52:10 -07:00
Crazylemon
ff01f5f0c5
Goon "Irradiated" disability now respects NO_DNA_RAD
2015-09-24 15:27:46 -07:00
Fox-McCloud
a26bf7172b
Merge pull request #2139 from Markolie/sql
...
Nuke the privacy poll, offer ghosts control option, memo update, SQL update, fixes
2015-09-23 23:42:06 -04:00
Markolie
605ef1a7e1
Whoops
2015-09-24 04:40:42 +02:00
Markolie
1a2459de0a
check_rights/R_MOD update
2015-09-24 04:35:04 +02:00
Markolie
14f64b2b24
Fixes for Vox/Plasmamen highlanders/dodgeball players
2015-09-23 21:17:40 +02:00
Mark van Alphen
16090e6a1f
Merge pull request #2129 from Fox-McCloud/chem-proc-change
...
Changes a Chemistry Transfer Proc
2015-09-23 19:50:20 +02:00
Markolie
b4a4f29f3f
Vox/Plasmaman spawn/wizard update
2015-09-23 08:14:12 +02:00
Fox-McCloud
d602d128f7
Merge remote-tracking branch 'upstream/master' into rcs-update
2015-09-23 01:19:28 -04:00
Mark van Alphen
70359bbb21
Merge pull request #2127 from Fox-McCloud/botany-cargo
...
Botany Cargo Points
2015-09-23 07:09:47 +02:00
