Commit Graph

7776 Commits

Author SHA1 Message Date
Loganbacca
32af387a25 Cargo train tweaks
- Reduce speed to slightly slower than running
- Only knock people over if emagged, otherwise just bump them back
- Temporarily disable latching trailers inline because no directional sprites (may or may not introduce bugs)
2014-06-16 20:54:18 +12:00
mwerezak
832fb31941 Fixes many small wounds protecting against...
...internal damage.

Also removed started_healing() proc because it doesn't actually report
whether the wound is healing and isn't really used for anything.
2014-06-16 01:04:30 -04:00
mwerezak
9f594e4755 Bullets are now properly sharp 2014-06-15 20:28:34 -04:00
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
2014-06-15 20:25:39 -04:00
mwerezak
cbec032ae3 Fixes wrong wound types being used
This fixes the autoheal bug, which was being caused by wound types such
as tiny bruises from being used even for large amounts of damage.

I imagine that relying on the order of the list returned by typesof() is
always a bad idea.
2014-06-15 19:08:29 -04:00
Walter0o
85a6d8a32d fixes vox armalis being a choosable race
the IS_WHITELISTED flag will add the species to the whitelisted_species list,
which in turn gets used as the base list of choosable species in the char setup when
the server config has species whitelisting off.

unless you want giant combat spessbirds as crew ( as a security force maybe ? ;) ),
this is a bug.
2014-06-15 20:27:51 +02:00
mwerezak
6d07d99885 Fixes old ferry shuttles (e.g. supply) not being able to use move() directly.
This shouldn't be necessary once the supply and emergency shuttles are
updated to the new system, however it will keep them working in the meantime.
2014-06-15 11:57:57 -04:00
paprka
7a28f5eea0 overeye 2014-06-14 21:04:05 -07:00
Chinsky
df4a8cf706 Merge pull request #5253 from faerindel/squash_tests
Adds buildable and upgradeable PSUs (battery racks, not SMES).
2014-06-15 07:15:14 +04:00
mwerezak
4d12d263e9 Adds docking control to ERT shuttle
Also adjusts the location of the centcom shuttle docking controller.
2014-06-14 18:35:02 -04:00
mwerezak
40d9c4e26e Adds centcom and admin shuttle docking controllers 2014-06-14 15:52:26 -04:00
mwerezak
6b9d887a2d Adds engineering shuttle docking controllers
Also fixed bad req_access_txt. Was accidentally using req_access_txt
instead of req_one_access_txt. Fixed virology maint not having any
access codes set.
2014-06-14 15:51:46 -04:00
mwerezak
d837e5d246 Streamlined docking code
Server and client now have more consistent responsibilities.
Ferry shuttles will always be forced undocked when moved, even if moved
by admin magic.
2014-06-14 15:51:26 -04:00
mwerezak
e30ffebe49 Adds mining shuttle docking controllers 2014-06-14 15:16:23 -04:00
mwerezak
dc7d8fafe0 Adjusts how undocking signals are used
Now both server and client will to undock concurrently. It looks much
more natural.
2014-06-14 15:16:05 -04:00
mwerezak
232e50e415 Shuttle console refactoring
Also adjusted the way undocking signals were used.
2014-06-14 15:15:48 -04:00
mwerezak
acec01fb14 Docking overrides now have a clear purpose
Originally the purpose of the docking override was to allow the shuttle
to move even if it couldn't undock properly (e.g. the doors were stuck
open), however it makes more sense just to have the shuttle take care of
that. This commit now makes the behaviour of the docking overrides line
up with it's new purpose.
2014-06-14 15:15:30 -04:00
Chinsky
09420d9fba Merge pull request #5248 from Zuhayr/master
Robot fixes.
2014-06-14 23:05:46 +04:00
Zuhayr
c0138b8e81 Merge pull request #5251 from Loganbacca/train
Cargo train bugfixes
2014-06-15 03:49:17 +09:30
Zuhayr
cd4a8ff745 Amending a runtime in the mmi change. 2014-06-15 03:39:27 +09:30
Chinsky
1a3cd3786d Merge pull request #5239 from Nerezza/dronelights
Built-in drone lighting
2014-06-14 19:10:14 +04:00
igalan
9a27556421 Let's test this rebase thing. 2014-06-14 15:20:25 +01:00
Zuhayr
194f1121c3 Amending a previous commit. 2014-06-14 20:31:35 +09:30
Loganbacca
70a4e5a240 Cargo train bugfixes
Also adds admin messaging when someone gets run over.
2014-06-14 22:51:06 +12:00
Zuhayr
05a1bededb Fixes #5236 2014-06-14 18:39:33 +09:30
Zuhayr
15d063c130 Fixes #4959 2014-06-14 18:33:06 +09:30
Zuhayr
98bddb9612 Fixes #5245 2014-06-14 18:06:47 +09:30
Zuhayr
cd5818fd29 Fixes #5243 2014-06-14 18:06:31 +09:30
Zuhayr
cf1fe85e62 Fixes #5246 2014-06-14 18:04:19 +09:30
Zuhayr
80db3a284b Merge pull request #5216 from Loganbacca/trainmerge
Cargo Trains
2014-06-14 17:13:55 +09:30
Ccomp5950
5c115525cf Bugfix: Humans will no longer send the same message twice when talking on binary.
Also:  Removed the beep boop boop from showing up if you are the src of the communication.
2014-06-13 20:47:02 -05:00
Nerezza
52a76c0b0b Make drone light into verb
Removes the penlight and builds a low power LED into the chassis.
Already tested to work locally, won't ghost a light.
2014-06-13 14:39:49 -05:00
Mloc-Argent
9896e44d8a Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/unsorted.dm
2014-06-12 18:56:26 +01:00
Chinsky
6d432d8e9d Merge pull request #5219 from Zuhayr/autolathe
Autolathe rewrite.
2014-06-12 20:28:44 +04:00
Ravensdale
1fe53510ed Merge branch 'master' of https://github.com/Baystation12/Baystation12 into freeze-master-merge 2014-06-12 05:04:28 -07:00
Zuhayr
0722775bda Merge pull request #5207 from mwerezak/get_turf_loc-cleanup
Cleans up get_turf_loc()
2014-06-12 18:13:01 +09:30
Chinsky
c56ab301d1 Compile fix for a fix for legcuffs. 2014-06-12 02:50:11 +04:00
Zuhayr
4244479e43 Reapplying some changes. 2014-06-12 01:23:32 +09:30
Zuhayr
136ccc347b Merge with dev. 2014-06-12 01:14:40 +09:30
Chinsky
1f7a9355f8 Merge pull request #5212 from faerindel/hydro_refactor
Hydroponics refactor, part 1: Files.
2014-06-11 13:30:51 +04:00
Chinsky
238d5dfc2a Merge pull request #5211 from Ccomp5950/mentor_change
Mentor permissions fixes and such.
2014-06-11 13:16:18 +04:00
Chinsky
95781d751a Merge pull request #5206 from mwerezak/shoe-cuffs
Fixes #5190
2014-06-11 13:10:43 +04:00
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
Ccomp5950
0e0c692634 Removed debugverb 2014-06-11 00:51:20 -05:00
igalan
eee72ce802 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydro_refactor 2014-06-11 03:45:00 +01:00
igalan
7d08d4701c Hydroponics refactor, part 1: Files.
No code actually modified, just moved from all over the place to a module folder.

defines/obj/hydro.dm split:
-Seeds into seeds.dm
-Tools like the analyzer, pest and weedkillers into hydro_tools.dm. Hatches and scythe from defines/obj/weapon.dm moved there too.
-Non-edible plants like nettles into grown_inedible.dm. Special procs in items/weapons/hydroponics.dm moved there.
-Biogenerator and hydroponics tray files moved.
2014-06-11 03:44:29 +01:00
Ccomp5950
3aa766c689 Merge branch 'master' of github.com:Baystation12/Baystation12 into mentor_change 2014-06-10 19:49:42 -05:00
Ccomp5950
77c733b17c Mentor permissions fixes and such.
Created a helper proc /proc/is_mentor(client) use this when determining if someone is a mentor and they aren't the usr of the proc (rights_check uses usr)

Mentors will no longer hear ghosts while playing
Mentors will no longer see orange text around names in check_player_age panel if they have special_roles
Mentors will no longer be able to tell players with special roles through the use of player_panel
Mentors will no longer be able to aghost, use antagHUD, then return to their bodies.
2014-06-10 19:48:41 -05:00
Zuhayr
c841db56b6 Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:24:28 +09:30
Zuhayr
5be9f0e12f Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:15:28 +09:30