Commit Graph

4009 Commits

Author SHA1 Message Date
Chinsky
1ca6a54d3a Merge pull request #5265 from mwerezak/wound-fixes
Fixes the wounding system
2014-06-17 14:41:22 +04:00
mwerezak
944394a042 Fixes armour being applied to projectiles twice 2014-06-17 01:20:49 -04:00
mwerezak
72377d160f Fixes apply_damage ignoring species mods
Also adds some adjust*Loss type procs for adjusting the damage on
specific body parts. apply_damage() should be the standard way to deal
damage to a mob, though.
2014-06-17 00:54:20 -04:00
mwerezak
274b03b083 Adds thrown object sharp and edge flags 2014-06-16 23:21:01 -04:00
unknown
e16658c37f Adds diona unarmed attack type 2014-06-16 19:23:20 -04:00
unknown
95e05a894b Fixes projectile sharp and edge flags being ignored 2014-06-16 19:17:20 -04:00
Boop
07a6ad4897 Fixes #5270
Changes simple_animal/Die() to use death from mob/living instead.
2014-06-16 23:30:37 +01:00
mwerezak
45c2274b0a Species claws are now sharp 2014-06-16 12:54:09 -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
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
paprka
7a28f5eea0 overeye 2014-06-14 21:04:05 -07:00
Chinsky
09420d9fba Merge pull request #5248 from Zuhayr/master
Robot fixes.
2014-06-14 23:05:46 +04:00
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
Zuhayr
194f1121c3 Amending a previous commit. 2014-06-14 20:31:35 +09:30
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
Ravensdale
1fe53510ed Merge branch 'master' of https://github.com/Baystation12/Baystation12 into freeze-master-merge 2014-06-12 05:04:28 -07:00
Zuhayr
136ccc347b Merge with dev. 2014-06-12 01:14:40 +09:30
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
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
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
mwerezak
9c6cd39b9c Fixes compile error 2014-06-05 23:05:35 -04:00
Hubblenaut
a80f2b12e6 Movement with wheelchair not possible in space 2014-06-05 22:51:37 -04:00
Hubblenaut
1e09995f63 Wheelchairs spawn on footless characters 2014-06-05 22:50:42 -04:00
Hubblenaut
3c1d0a83bf Fixes. Wheelchair is supposed to help the occupant and not the driver, damn it. 2014-06-05 22:50:24 -04:00
Hubblenaut
1e450d301d Adds Wheelchairs with basic driving functionality 2014-06-05 22:49:20 -04:00
Zuhayr
4233f2eb8c Update drone.dm
Typo fix and message trim fix.
2014-06-06 10:13:40 +09:30
Hubblenaut
d5aacc8e79 Fixes setting internals on belt- and suit storage slots being ignored 2014-06-05 00:41:54 +02:00
Zuhayr
a00d4295a4 Fixed small drone talk and Bump() issues. 2014-06-04 16:26:12 +09:30
Jeremy Liberman
2a6e6bb021 Merge branch 'dev' into mutiny 2014-06-03 21:27:42 -05:00
Jeremy Liberman
dc67453796 Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel. 2014-06-03 21:26:34 -05:00
Loganbacca
7d7d095e5c New vehicle framework
- Implements a new vehicle framework
- Adds cargo trains
2014-06-03 22:18:49 +12:00
mwerezak
a6bc516313 Readds flashes to all robots except drones.
Drones also get a special low-power flashlight, now.
2014-06-02 23:05:37 -04:00
mwerezak
29fac4e05c Adds drone cameras to engineering network 2014-06-02 20:13:23 -04:00
mwerezak
6b11904e28 Fixes all robot_modules having access to flashes 2014-06-02 20:09:09 -04:00
mwerezak
5a1782f2f1 ID swiping drones now uses visible_message() 2014-06-02 19:52:18 -04:00
mwerezak
475bd59284 Fixes #5118
Also fixes robot/access() so that it will accept any one of the accesses
in req_access, instead of all - a much more likely use case.
2014-06-02 19:38:33 -04:00
Chinsky
6599545499 Merge pull request #5119 from boopcat/happydrones
refactors some disposals filtering code and remaps some disposals pipes
2014-06-02 18:19:28 +04:00
Zuhayr
ff20919ab5 Fixes a minor icon-flicker thing with the drone fabricator. 2014-06-02 15:41:38 +09:30
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
Boop
168c39dd54 refactors some disposals filtering code and remaps some disposals pipes
New things!
/obj/structure/disposalpipe/tagger
 - retags a holder when it passes through
/obj/structure/disposalpipe/tagger/partial - retags a holder when it passes through two times; good for loop detection
/obj/structure/disposalpipe/sortjunction/wildcard - filters out all holders that are tagged
/obj/structure/disposalpipe/sortjunction/untagged - filters out untagged holders

Tagging doesn't use an icky list index system any more, tags are put into a global list and directly checked against.

Changed the map around a bit, disposals is now a proper loop but anything that's not tagged, is tagged with "Disposals" or anything that passes the tagger twice will be filtered out.

Not a feature, just a fix for drones being sad about weird disposals. <3
2014-06-01 23:30:20 +01:00