Fox McCloud
62d25caec7
Merge pull request #2252 from tigercat2000/atommovablebuckling
...
Move buckling to /atom/movable, can now buckle to mobs if adminbooze
2015-10-01 19:01:39 -04:00
Mark van Alphen
b004303cf6
Merge pull request #2245 from Fox-McCloud/ZAS-Is-Dead
...
And So Dies ZAS
2015-10-01 19:27:22 +02:00
Tigercat2000
575362b0f4
Move buckling to /atom/movable, can now buckle to mobs if adminbooze
...
Also changed:
- Comment clarifying what buckle_lying = -1 means
- Changes direction of lying on operating tables, somehow missed it
2015-09-30 15:29:47 -07:00
Crazylemon
aaaaa14ae8
Fixes the misplaced quote
...
Does not fix: How tired I am
2015-09-30 08:05:34 -07:00
Crazylemon
d925ee8a10
Fixes the syntax errors and is more consistent with messages now
2015-09-30 07:59:29 -07:00
Crazylemon
6c5a643944
Fixes the roller_holder to work again
...
After the buckling rehaul, the roller holder couldn't unbuckle patients
nor collapse/collect beds. This should readd that functionality.
2015-09-30 01:42:35 -07:00
Fox-McCloud
3236fa8be5
And So Dies ZAS
2015-09-30 02:00:39 -04:00
Mark van Alphen
603a77bc3d
Merge pull request #2218 from Fox-McCloud/safe-cleanup
...
Safe Cleanup and Fix
2015-09-29 21:55:07 +02:00
Fox-McCloud
62fb3c2981
Safe Cleanup and Fix
2015-09-29 11:31:57 -04:00
Tigercat2000
ec2b31e435
Nuke wheelchair snowflake shit, fix the delay
2015-09-28 12:59:44 -07: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
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
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
Markolie
b914544a87
Fixes
2015-09-27 22:50:09 +02:00
Markolie
69f71268b8
Stop AI's from going into transit tubes
2015-09-27 03:38:22 +02: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
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
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
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
72e14e59da
RCS Update and Tweaks
2015-09-20 03:09:18 -04:00
Fox-McCloud
2d52bd90e1
Syndicate Ship Update
2015-09-17 08:22:50 -04:00
Tigercat2000
c562680098
Merge remote-tracking branch 'origin/master' into bay_examine
...
# Conflicts:
# code/game/objects/structures/displaycase.dm
2015-09-15 14:08:36 -07:00
Fox-McCloud
3aa9563f2b
Merge pull request #2049 from Markolie/display
...
Display case update
2015-09-15 16:02:43 -04:00
Markolie
0db5d89354
Notice --> Danger
2015-09-15 18:48:58 +02:00
Markolie
e64ac23677
Further display case improvements
2015-09-15 18:47:19 +02:00
Fox-McCloud
6fd7350746
Merge pull request #2040 from Markolie/guns
...
Guns update
2015-09-14 22:11:33 -04:00
Tigercat2000
0603f73232
Bay12 examine overhaul.
...
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
2015-09-14 11:51:40 -07:00
Markolie
59b78376e9
Display case update, some forceMove updates
2015-09-14 20:21:56 +02:00
Markolie
f41f0a59fe
Guns update
2015-09-14 04:05:20 +02:00
Fox-McCloud
f68518e3c1
Table Rack Destruction
2015-09-13 01:59:13 -04:00
Mark van Alphen
84b42c5491
Merge pull request #1986 from Fox-McCloud/nuke-and-tator
...
Nuke Ops and Traitor Update+Balance
2015-09-10 02:24:32 +02:00
Mark van Alphen
e499554fef
Merge pull request #1984 from Fox-McCloud/mining-voucher
...
Adds Mining Voucher to QM's locker
2015-09-10 01:13:58 +02:00
Fox-McCloud
1c6c733a52
Nuke Ops and Traitor Update+Balance
2015-09-08 19:38:30 -04:00
Fox-McCloud
1d7ecf48ff
Adds Mining Voucher to QM's locker
2015-09-08 12:53:57 -04:00
Tigercat2000
ee32c0a35a
Merge branch 'master' into intent_define
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2015-09-08 04:43:13 -07:00
Mark van Alphen
6c1208e18f
Merge pull request #1819 from Aurorablade/GoOnYourFeet
...
[Sprite] [TG Port] Things that go on your feet
2015-09-07 22:31:21 +02:00
Tigercat2000
be92665871
Replace magic intent words with defines, grab fixes
...
This commit does the following:
- Replaces all instances of magic intent words, like "harm" and
"help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM
- Fixes a few manual grab instances left over in attack_alien, they
will now used grabbedby()
2015-09-07 11:51:00 -07:00
KasparoVy
f3ba11fbda
Adds Warden Corporate and HoS Corporate Uniforms to Appropriate Lockers
2015-09-04 15:49:27 -04:00
