Fox McCloud
15c9873cdf
Merge pull request #2224 from Markolie/shitcode
...
Strange reagent fix, tod --> timeofdeath
2015-09-29 18:25:04 -04:00
Markolie
8b2e62fc10
Strange reagent fix, tod --> timeofdeath
2015-09-29 22:03:04 +02:00
Crazylemon
734e0842e2
Fixed a few more reversed add_logs
...
Did a search, and found 3 of these to patch up. Perhaps there's
something left, perhaps not.
2015-09-29 11:56:51 -07:00
Mark van Alphen
25f19dff0d
Merge pull request #2204 from Fox-McCloud/belt-of-holding
...
Ports NT Station's Belt of Holding Sprite
2015-09-29 18:47:17 +02:00
Fox-McCloud
7586390436
Merge pull request #2146 from TheDZD/vision
...
Shadowling, Changeling, and Vision Fixes/Changes
2015-09-29 11:44:06 -04:00
TheDZD
6705006ee7
Merge pull request #2213 from Fox-McCloud/destroy-fixes
...
Fixes a few Destroys
2015-09-28 19:28:29 -04:00
TheDZD
19d8aa3d36
Merge pull request #2215 from Markolie/s2
...
Fix flamethrower logs
2015-09-28 19:03:45 -04:00
DZD
b990b6c71b
Merge remote-tracking branch 'upstream/master' into vision
2015-09-28 19:03:14 -04:00
Markolie
6825c33cb9
Fix flamethrower logs
2015-09-29 00:51:17 +02:00
Fox-McCloud
be672419ca
Fixes a few Destroys
2015-09-28 18:15:39 -04:00
Markolie
2f148fd429
Cell update
2015-09-28 19:04:22 +02:00
Markolie
7678f601bc
Attack animation
2015-09-28 18:47:29 +02:00
Markolie
52b700f8c8
Proper sprite/sounds for electric arm
2015-09-28 18:45:57 +02:00
Fox-McCloud
444c616d5a
Ports NT Station's Belt of Holding Sprite
2015-09-27 23:43:41 -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
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
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
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
DZD
0a7f50bbe2
Spelling and sanity fixes
2015-09-23 16:20: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
DZD
37ea591087
Shadowling, changeling, and vision fixes/changes
2015-09-23 13:00:58 -04: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
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
Fox-McCloud
f94d3305f2
map changes
2015-09-21 00:45:00 -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
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
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
