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
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
f5f27fa186
Atmos analyzer update
2015-09-27 04:48:42 +02:00
Markolie
69f71268b8
Stop AI's from going into transit tubes
2015-09-27 03:38:22 +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
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
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
Markolie
e96103a02b
Fluff item clean-up
2015-09-25 04:31:30 +02: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
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
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
Fox-McCloud
d602d128f7
Merge remote-tracking branch 'upstream/master' into rcs-update
2015-09-23 01:19:28 -04:00
Markolie
9adff714b9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql
...
Conflicts:
code/controllers/configuration.dm
config/example/config.txt
2015-09-23 07:07:17 +02:00
Markolie
73bacbf17f
Preference option for instruments/sanitize tempo
2015-09-23 07:00:01 +02:00
Markolie
bf2cabeca3
Tab
2015-09-23 03:08:38 +02:00
Markolie
b770e8f2a0
Implant fixes/updates
2015-09-23 02:51:33 +02:00
Fox-McCloud
71001cc5ea
Changes a Chemistry Transfer Proc
2015-09-22 05:56:49 -04:00
Markolie
df8209afe6
Atmos fixes
2015-09-22 05:15:05 +02:00
Markolie
3c7413dc65
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
2015-09-22 00:17:30 +02:00
Mark van Alphen
78ad7adafa
Merge pull request #2111 from Fox-McCloud/russian-revolver
...
Adds in Russian Revolvers
2015-09-21 23:01:58 +02:00
Markolie
ea305d3ffa
Saber SMG update, add armour piercing variable
2015-09-21 22:50:07 +02:00
Fox-McCloud
f94d3305f2
map changes
2015-09-21 00:45:00 -04:00
Fox-McCloud
36ec45253e
Merge remote-tracking branch 'upstream/master' into rcs-update
2015-09-21 00:30:00 -04:00
Fox-McCloud
4e9befc310
Tweaks
2015-09-21 00:25:27 -04:00
Fox-McCloud
bd3696523b
GC a few Datums
2015-09-20 22:40:13 -04:00
Fox-McCloud
e371c9662a
Merge pull request #2106 from Markolie/pipenet
...
Pipenet revamp
2015-09-20 20:47:02 -04:00
Markolie
c5c64413a1
Pipenet overhaul
2015-09-21 02:11:54 +02:00
Fox-McCloud
263c67ea2e
tweak
2015-09-20 17:26:01 -04:00
Fox-McCloud
941e833290
suicide act for the suicide game
2015-09-20 09:13:51 -04:00
Fox-McCloud
17d38f81c6
Adds in Russian Revolvers
2015-09-20 08:56:11 -04:00
Fox-McCloud
72e14e59da
RCS Update and Tweaks
2015-09-20 03:09:18 -04:00
Fox-McCloud
3777639425
Fixes Utensil Feeding
2015-09-19 05:14:25 -04:00
TheDZD
268992a32f
Merge pull request #2081 from Fox-McCloud/borg-update
...
Borg Update: MMI and Suits
2015-09-18 22:31:21 -04:00
TheDZD
7e9b2f99b1
Merge pull request #2091 from Fox-McCloud/destroy-them-all
...
Fixes up a few Destroys
2015-09-18 22:30:49 -04:00
TheDZD
b27753e163
Merge pull request #2088 from Fox-McCloud/point-rework
...
Point Rework
2015-09-18 22:30:22 -04:00
Fox-McCloud
56ed8c1a7e
Pass III
2015-09-18 21:15:08 -04:00
TheDZD
942c1abc76
Merge pull request #2082 from Fox-McCloud/syndi-ship-update
...
Syndicate Ship Update
2015-09-18 18:54:59 -04:00
Fox-McCloud
1d91e31d17
pass II, taperecorder exploit fix
2015-09-18 05:46:00 -04:00
Fox-McCloud
74565c101b
Fixes up a few Destroys
2015-09-18 04:20:02 -04:00
Fox-McCloud
6a79ff83a1
Merge pull request #2090 from Markolie/fixesss
...
Radio examine/matter eater fix, GC testing move
2015-09-18 01:20:27 -04:00