f1c44601e5
Brig Fixes
...
Fixes a few lighting issues, brig cell doors, adds missing berets to the
wardrobe and closes disposals outlet.
2014-08-14 18:26:17 -04:00
6fffe8e077
Merge remote-tracking branch 'upstream/dev' into Brig2
2014-08-14 08:58:59 +02:00
2a46b83dce
Adds new items. Source: https://github.com/Baystation12/Baystation12/pull/5928
2014-08-13 09:35:04 +02:00
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
2c30af6124
Fireaxe cabinet hacking now fails if player moves away
2014-08-04 14:53:33 -04:00
a36becad2b
Wet rag no longer makes noise or hits when wiping down windows (nor does anything with the NOBLUDGEON flag)
2014-08-01 17:05:54 -07:00
d5e9851b62
integrate XGM into the code
...
New turf proc: assume_gas(). Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
more.
Zones now process all fire data and existance in one go, fire objects
only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
structured for the new gas_mixtures.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-22 19:52:12 +01:00
1a52aa7b06
Merge remote-tracking branch 'upstream/dev' into op-hideout
2014-07-16 17:41:30 -04:00
f795712a95
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2014-07-16 19:30:41 +09:30
4ee6b77289
Adds new syndicate closet and adjusts nuke setup
2014-07-15 17:22:03 +02:00
f2845dbe76
Thrown items can be targeted, has miss chance...
...
...based on distance, similar to projectiles.
2014-07-15 01:14:04 -04:00
aad89409de
Slime update
2014-07-13 17:37:30 +04:00
0d21889bee
Fixed some bugs, did some testing, moved some procs around for robot functionality.
2014-07-11 13:50:34 +09:30
70ba371658
Merge resolution.
2014-07-11 12:47:16 +09:30
64d2a69a32
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/carbon/human/human_damage.dm
2014-07-06 17:50:53 +01:00
21e625d89b
Added Crisis and Surgeon modules, removed Medical module, added Construction module, altered Mining and Engineering modules.
2014-07-05 16:48:59 +09:30
34d19d16f5
Fffffff fixes crates not budging properly.
2014-07-05 04:17:12 +09:30
67da4096b3
Fixes #5461
2014-07-04 17:48:01 +09:30
0c11ebe8e8
Fixes #5490
2014-07-04 17:39:45 +09:30
97f997dd30
Fixes in wheelchair and different handling of movement
2014-07-02 22:42:18 +02:00
6630e4838e
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/alarm.dm
2014-06-30 23:44:46 +01:00
a6c7093818
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robust-squash
...
Conflicts: lots
2014-06-29 19:16:36 +04:00
2556d3f227
Stunbatons now run on charge.
...
Adds improvised weapons.
Increases unarmed stun time, decreases push stun time.
Increases melee embedding chance.
2014-06-29 17:46:06 +04:00
922e425a33
Fixed moving between tables freely.
2014-06-29 10:46:31 +09:30
c7e9e1aa2a
Fixed It won't budge! from crates, added drag and drop for table climbing, added Adajcent check to table climbing.
2014-06-29 09:40:37 +09:30
14818b312a
Psychiatrists couch
2014-06-27 22:38:57 +03:00
dda6ef82bd
Psych bed >> Freudian couch
...
Vetinarix kept the icon_state name when the Medbay Renovation PR thing got in. Malsquando wanted this changed.
2014-06-27 10:22:05 +03:00
906ef41522
The tactical closet now calls ..() in its New() proc, allows for swallowing items placed on-top among other things.
2014-06-25 18:32:48 +02:00
d96a901ea0
Merge pull request #5342 from Zuhayr/dev
...
Allows climbing onto tables and crates, also adds falling off if you are...
2014-06-24 13:05:17 +04:00
a5c2af7a57
Shuffling around table and crate knock/climb procs.
2014-06-24 11:11:02 +09:30
7fe8a89e58
Makes table/crate falling a bit more dangerous.
2014-06-24 07:17:24 +09:30
1aca3fe7f2
atmos: make fires more destructive
...
Fires can now burn through walls, windows, and (with a high enough
temperature) rwalls.
New proc: adjacent_fire_act(). Called on turfs that a fire isn't able
to spread to. (walls, floor surrounded by windows, etc.)
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-23 20:58:14 +01:00
a33cb7272b
Merge remote-tracking branch 'upstream/master' into dev
2014-06-23 20:57:47 +01:00
8fe013d531
Allows climbing onto tables and crates, also adds falling off if you are dumb enough to stand on one that is flipped or opened.
2014-06-24 03:21:27 +09:30
65013ac5a1
Merge pull request #5325 from mwerezak/temperature-expose
...
Fixes FEA temperature_expose() being used instead of ZAS fire_act().
2014-06-23 00:19:15 +09:30
183ee20ab6
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-06-22 21:58:30 +09:30
37e63dfcb0
Fixes FEA temperature_expose() being used...
...
...instead of ZAS fire_act().
2014-06-22 00:13:22 -04:00
b7832f862a
Fixes #5311
2014-06-21 00:58:31 +04:00
8a4739197e
Merge branch 'backup' into medical
2014-06-19 15:36:28 +02:00
909c2d44a9
Removes medical belts from lockers
2014-06-18 22:35:56 +02:00
be95e54e43
Merge branch 'master' into dev
...
Conflicts:
code/defines/obj/weapon.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/living/silicon/say.dm
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-06-17 16:16:44 +04:00
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
0722775bda
Merge pull request #5207 from mwerezak/get_turf_loc-cleanup
...
Cleans up get_turf_loc()
2014-06-12 18:13:01 +09:30
4ee8f56c29
Merged master to dev, manually fixed merge issues in map, may be some left.
2014-06-11 18:11:41 +09:30
a8816823a5
Replaces get_turf_loc() with get_turf()
...
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
2014-06-10 13:43:11 -04:00
c2f2a7cde6
Refactored material definitions a little bit, removed all bananium from the codebase.
2014-06-08 00:40:34 +09:30
5098c6a85c
Makes crashing into things possible with extinguisher or harm intent
2014-06-05 22:49:38 -04:00
1e450d301d
Adds Wheelchairs with basic driving functionality
2014-06-05 22:49:20 -04:00
72ca3372b6
Airlock construction fix
...
- door electronics now stay on mob until fully installed
- text fix
2014-06-05 18:09:05 +10:00
4091bcf7b3
Change selection interface to have cancel button
2014-06-02 15:39:43 +01:00
Raptor1628