c08774d96e
Updates bear traps
...
Moves to trap.dm.
Cleans up trap attacking code.
Fixes trap remaining anchored once triggered.
Instead of embedding, traps now buckle their victim into place.
Deaf messages, where appropriate.
Gave beartraps a more setting-friendly name.
Conflicts:
baystation12.dme
2015-05-24 16:33:41 -04:00
c21a456379
Fixes #9447 .
...
The inteliCard now has a NanoUI interface, allowing it to utilize custom CanUseTopic() checks depending on context, in-hand or in-rig.
2015-05-24 11:33:54 +02:00
e74c0e65bf
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/power_cells.dm
2015-05-22 08:26:13 +02:00
3377f8bbf1
Merge pull request #9407 from GinjaNinja32/floorpainter
...
Fixes floor painter 'side/3 corners'->'black' and another state
2015-05-21 18:43:00 +09:30
0aff37a72c
Fixes floor painter 'side/3 corners'->'black' and another state
2015-05-21 06:03:15 +01:00
91de5b2d9d
Merge pull request #9381 from GinjaNinja32/patch-1
...
Fixes #9380
2015-05-21 03:27:28 +03:00
aeb8f2a6c2
Fixes #9380
2015-05-20 16:44:47 +01:00
71da36ec01
Updated force vars on bats.
2015-05-21 00:52:17 +09:30
a6f59edc22
Bit of documentation.
2015-05-20 14:00:14 +09:30
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
defc4c1f94
Adds check_charge(), checked_use()
2015-05-18 20:09:09 -04:00
53855d2398
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into charge
2015-05-18 18:47:45 -04:00
e2e0ffc6e5
Compilation fixes.
2015-05-18 18:04:29 +02:00
c2200109d0
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/twohanded.dm
2015-05-18 17:50:48 +02:00
3ed1917c3a
Vine tweaks. Fireaxes one-shot vines, vines are mouse opaque.
2015-05-18 13:23:21 +09:30
a5aede3b70
Gives IA agents bridge access and the HoS' encryption key. Changes IA agents' supervisor to Nanotrasen officials and regulations.
2015-05-17 12:43:20 -04:00
4ea779ae6c
Merge pull request #9304 from PsiOmegaDelta/WelderIcon-150516
...
Cleans up welder code.
2015-05-17 20:21:31 +09:30
8ce787ef68
Final tweaks to recipe availability and material inheritance.
2015-05-17 18:22:21 +09:30
2c60619273
Restores the original messages.
2015-05-17 10:25:37 +02:00
ed34aa2466
Rebalancing and adjusting divisors for all weapon damage values.
2015-05-17 16:51:55 +09:30
4cd2a5a532
Updating stools/stool padding.
2015-05-17 12:53:23 +09:30
ae3ad84634
Updated ashtrays and mineral doors.
2015-05-17 03:02:03 +09:30
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
a101855343
Converted over hatchets and scythes.
2015-05-17 00:15:46 +09:30
b8ca15f541
Tweaks/fixes and greyscale icons.
2015-05-17 00:07:29 +09:30
83570a1a9e
Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev
2015-05-16 23:35:05 +09:30
aad28d63ce
Cleans up welder code.
...
Icon and inhand states should now update properly.
2015-05-16 14:13:24 +02:00
150b24023e
Renamed kitchen utensils.
2015-05-16 21:24:36 +09:30
f4923e2a20
Renamed twohanded weapons, collapsed bats.
2015-05-16 21:12:54 +09:30
a32179a062
Renamed knives.
2015-05-16 20:54:34 +09:30
8aa24b86bb
Renamed shards, katanas, claymores.
2015-05-16 20:36:33 +09:30
0fb27e83b0
Preliminary file for material weapon system.
2015-05-16 20:14:35 +09:30
f27ddd548f
Restructuring a bunch of files in prep for widespread path changes.
2015-05-16 20:09:28 +09:30
966d797e07
Converts bat to use the material system.
2015-05-16 19:59:21 +09:30
edb1d501d6
Fixes #9217
2015-05-16 17:56:28 +09:30
76654321e4
Merge remote-tracking branch 'upstream/dev' into new_tables
...
Conflicts:
code/setup.dm
2015-05-16 08:53:33 +01:00
5b9eefdebf
Merge with dev.
2015-05-15 23:22:48 +09:30
1e1471a601
Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173 .
2015-05-15 23:19:57 +09:30
624ffcff4c
Fixes #9239
2015-05-15 18:40:32 +09:30
10915eae24
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/customitems/item_defines.dm
code/modules/projectiles/guns/launcher/syringe_gun.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers/food/drinks.dm
code/modules/reagents/reagent_containers/pill.dm
maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
354859b889
Generalises shards, makes tables possibly create shards when falling apart, make tablesmash potentially give someone a faceful of broken glass if the table breaks
2015-05-15 04:47:18 +01:00
21394e78c4
Merge remote-tracking branch 'upstream/dev' into new_tables
2015-05-15 00:12:40 +01:00
cfb51cf198
better nanoui caching + fixes
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-14 22:35:50 +01:00
8d83e8d452
Merge pull request #9202 from Zuhayr/customitems
...
Custom items refactor.
2015-05-14 21:47:04 +03:00
4ec41c73ca
Merge pull request #9195 from atlantiscze/radio-fix
...
Fixes common channel radios not working.
2015-05-14 12:34:43 -04:00
9ed8f69e02
Merge pull request #9240 from Techhead0/internalsBox
...
Moves survival boxes to species datums.
2015-05-14 09:38:24 +02:00
aeb1f5ae68
Updates instances of if(cell.use(...))
2015-05-14 01:52:04 -04:00
fb329fb8e0
Merge remote-tracking branch 'upstream/dev' into new_tables
2015-05-13 20:46:58 +01:00
5f65565f45
Bugfixes, removing the remnants of table_parts, changelog.
2015-05-13 20:40:00 +01:00
4b87799072
New tables, code section. Changelog entry soon.
2015-05-13 19:08:39 +01:00
mwerezak