Zuhayr
1eb759447e
Merge resolution, using dev-freeze map due to unreconcilable conflicts.
2014-09-13 16:54:48 +09:30
mwerezak
716c6ab3ef
APC cell_type is now an actual power cell type
2014-09-10 22:12:43 -04:00
Whitellama
71c2317264
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame
...
Conflicts:
code/game/objects/items/weapons/storage/belt.dm
2014-09-01 18:31:26 -07:00
Zuhayr
aedb3725f2
Fixes #5874
2014-09-01 23:20:27 +09:30
Zuhayr
066772b1ce
Fixes #5879
2014-09-01 22:45:37 +09:30
Whitellama
9cd42a3f33
Changes candle.dm procs to absolute paths
2014-08-31 19:48:34 -07:00
Whitellama
d536f7d56a
Fixed police tape not going in tactical combat belts
2014-08-31 15:34:21 -07:00
Whitellama
f5c9586153
Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.
2014-08-31 02:12:04 -07:00
Zuhayr
ee499426ad
Compile fixes.
2014-08-21 12:19:10 +09:30
Zuhayr
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
Whitellama
26721cf0d5
Fixed eggs not going back into egg boxes
2014-08-19 02:44:58 -07:00
Chinsky
e4847b729e
Merge pull request #5994 from GinjaNinja32/shards
...
Stepping in shrapnel fix and unification of shard code
2014-08-14 22:55:39 +04:00
GinjaNinja32
9b9b69f547
Use absolute paths
2014-08-14 11:20:07 +01:00
Zuhayr
43a7757252
Merge pull request #5982 from Jarcolr/customs
...
Adds the cigar case as a premium cigarette vending machine item.
2014-08-14 12:02:49 +09:30
GinjaNinja32
539392c14e
Use \the macro
2014-08-13 21:30:28 +01:00
GinjaNinja32
05e7c4a07a
Moved all shard code to one file. Fixed #5992
2014-08-13 21:05:27 +01:00
GinjaNinja32
d1fc12e1c7
More proximity fixes
2014-08-13 20:58:49 +01:00
Jarcolr
6c807199c9
Adds the cigar case as a premium vending item
...
5 may be a bit too much, but who is going to get all those coins,
anyway?
2014-08-13 12:10:43 +03:00
Walter0o
7aa7f1c56c
getting rid of text macro
2014-08-12 02:24:37 +02:00
Walter0o
dd39fbe985
typo fix
2014-08-11 23:23:38 +02:00
Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
Chinsky
18070da974
Merge pull request #5922 from Jarcolr/customs
...
Complements the job specific satchels with 5 new job specific backpacks
2014-08-10 04:02:26 +04:00
Jarcolr
b4e9d9923f
Complements the satchels with backpacks
...
5 new backpacks: virologist, chemistry, geneticist, science,
hydroponics.
2014-08-08 22:20:11 +03:00
Zuhayr
aa90ebb0c6
Merge pull request #5903 from Ccomp5950/mouse-trap-tag-fix
...
Fixed the font tag on mouse traps description.
2014-08-07 10:01:23 +09:30
Ccomp5950
74fd47e2de
Fixed the font tag on mouse traps description.
2014-08-05 18:55:15 -05:00
Ccomp5950
52da372bac
Fueltanks now log and admin_msg when shot at / weldered
2014-08-04 21:11:09 -05:00
Ccomp5950
f95074d17e
Merge pull request #5887 from mwerezak/jetpack-icon
...
Fixes #5852
2014-08-04 15:17:02 -05:00
mwerezak
cf3a37d732
Fixes #5852
2014-08-03 12:32:37 -04:00
mwerezak
cf9fe8de76
Fixes some handcuff oversights
...
You now don't need to be grabbing to put handcuffs on yourself, and you
can now put hancuffs on if your grab state is higher than aggressive.
2014-08-03 11:49:37 -04:00
Walter0o
a586c1dd70
remove double paper/attack() definition
2014-08-03 13:52:47 +02:00
mwerezak
768019b918
Stunbaton fixes and cleanup
...
Apparently harm intent is "hurt", not "harm"
2014-07-31 19:17:05 -04:00
mwerezak
71e54111ab
Handcuffs now require an aggressive grab
2014-07-31 18:10:11 -04:00
mwerezak
5b90e4afc6
Allows the use of stun weapons to show up in autopsies
2014-07-31 17:01:06 -04:00
mwerezak
56ccd4303b
Merges taser and stun baton effects
...
Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm
2014-07-31 16:21:22 -04:00
mwerezak
c8cccb64f6
Adds siemens_coefficient handling to stun batons
2014-07-31 15:38:56 -04:00
mwerezak
9bfb4642a2
Merge remote-tracking branch 'upstream/dev' into stun-baton
...
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
Made all obj/item/weapons have "swing_hit" as their default hitsound.
Made hitsound not play when the attack misses.
2014-07-31 14:31:21 -04:00
mwerezak
7130fd124b
Stun baton nerf
...
Adds agonyforce var to stun batons, which causes halloss and eye blur.
Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.
2014-07-31 13:39:06 -04:00
Whitellama
8f1417f14c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext
2014-07-26 17:09:12 -07:00
Whitellama
bbc9150793
Updated body_parts_covered
2014-07-26 17:06:08 -07:00
Zuhayr
efe1c2feb2
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-26 15:39:25 +09:30
DJSnapshot
a4fc2b04a2
fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work)
2014-07-25 16:56:56 -07:00
Mloc-Argent
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
Zuhayr
60d9d3d5e6
Merge resolution.
2014-07-21 16:34:38 +09:30
Zuhayr
ff38aca774
Merge resolution.
2014-07-21 16:17:15 +09:30
Whitellama
342a187c8b
Eating with utensils now produces the eating sound, fixed #5687
2014-07-19 18:33:30 -07:00
Mloc-Hibernia
51d2451c01
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
nano/templates/geoscanner.tmpl
2014-07-18 13:15:30 +00:00
Mloc-Hibernia
281a26b979
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2014-07-18 13:08:12 +00:00
Zuhayr
3976433396
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-17 20:57:06 +09:30
Walter0o
6c62e9e56b
should fix #5618 , trivial kitchen utensil bug
2014-07-16 20:28:19 +02:00
Zuhayr
f4ff51f146
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-16 19:32:00 +09:30
