Commit Graph

17479 Commits

Author SHA1 Message Date
mwerezak
598ab2a207 Adds a mostly module-less merc rig type 2015-02-20 19:21:32 -05:00
emmanuelbassil
db702e13b6 Fixes #8174 2015-02-20 23:33:22 +02:00
PsiOmega
18521e6983 Now possible to order a kit with a random toxin and syringe - 4TC 2015-02-20 21:13:34 +01:00
PsiOmega
f0a5dae1c4 Icarus cannon admin logs. 2015-02-20 19:54:15 +01:00
Kelenius
83fc1689ef Fixes a turret runtime 2015-02-20 20:19:12 +03:00
PsiOmega
5b299e0104 NanoUI atmosphere control and remote air alarm support. 2015-02-20 17:39:55 +01:00
Zuhayr
31edc34a3d Merge pull request #8184 from Kelenius/ofDronesAndVerbs
Axes drone verb category
2015-02-21 02:32:30 +10:30
Kelenius
4aee297d2e Axes drone verb category
Moves verbs to "robot commands"
2015-02-20 17:21:12 +03:00
Neerti
3f16754e89 Third refactor for examine system! This time we go back to atom-var based system, but because strings are tabled, it's apparently okay.
The entire system is now self-contained inside a module folder.
Also fixes a runtime I made because ghosts lack a mind (and so do I)
2015-02-20 08:04:17 -05:00
Kelenius
a0b73140e9 Fixes for synths and decompiler 2015-02-20 13:32:10 +03:00
Zuhayr
77805bfd05 Merge pull request #8179 from comma/undies
Fixes a sanity check turned insanity check forcing everyone to go commando
2015-02-20 17:01:25 +10:30
mwerezak
32b543c4e4 Firedoors and blast doors no longer block zones
Firedoors no longer block zones, fixes #8169
Blast doors no longer block zones as well, which fixes some of the awkward zone geometry seen in #4798
2015-02-19 23:36:21 -05:00
Zuhayr
df8b3c3804 Merge pull request #8172 from PsiOmegaDelta/AirlockCycling
Less screen wandering NanoUI windows.
2015-02-20 14:46:01 +10:30
MrSnapwalk
71f8a5c8e8 Minor fixes, action figure refactor. 2015-02-19 20:37:36 -06:00
Kelenius
1c1e644f29 Adds robot synths 2015-02-19 21:04:27 +03:00
Chinsky
fde327a83c Merge pull request #8121 from Neerti/2_13_2015_examine_tab
Adds the Examine Tab.
2015-02-19 21:00:22 +03:00
PsiOmega
d32cffaefe NanoUI air alarm interface. Remote support lost. 2015-02-19 18:23:25 +01:00
PsiOmega
ead0f31426 Revises how Topic and NanoUI shares allowance-logic.
All mob-interaction logic now resides in nanointeraction.dm and is called by the base CanUseTopic().
Specifics for when objects allows mob-interaction can be specified by overriding CanUseTopic(), see machinery.dm.
2015-02-19 18:22:19 +01:00
Chinsky
ae0ce4e620 Merge pull request #8170 from mwerezak/inventoryfix
Fixes #8075 + cigar/pipe overlays
2015-02-19 19:59:16 +03:00
Chinsky
3c4bc1984c Merge pull request #8159 from mwerezak/grab
Updates grabbing
2015-02-19 19:59:13 +03:00
Zuhayr
9a625e15d5 Merge pull request #8171 from mwerezak/layerfix
Fixes hiding mobs being layered underneath vents
2015-02-20 01:20:12 +10:30
PsiOmega
675b277d16 NanoUIs based on embedded controllers should no longer wander across the screen.
calling updateDialog() forces a NanoUI window to re-openi, which is a bit of a pain when done in process().
2015-02-19 10:43:10 +01:00
mwerezak
1258517202 Fixes hiding mobs being layered underneath vents 2015-02-19 01:02:32 -05:00
mwerezak
01784d8d6a Fixes cigar/pipe mob overlays not updating when lit 2015-02-19 00:44:11 -05:00
mwerezak
82480ac1a7 Minor cleanup 2015-02-19 00:43:49 -05:00
mwerezak
6b6fcf81f2 Fixes #8075 2015-02-18 23:55:21 -05:00
MrSnapwalk
cc0266c776 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into moretoys
Conflicts:
	code/game/objects/random/random.dm
2015-02-18 19:02:23 -06:00
mwerezak
2db45d592f Makes the Z8 wearable on the back, adjusts some desc text. 2015-02-18 18:44:23 -05:00
mwerezak
11e5497368 Merge remote-tracking branch 'upstream/dev' into gun-rewrite
Conflicts:
	code/modules/projectiles/projectile/bullets.dm
2015-02-18 18:28:18 -05:00
mwerezak
583390937e Improves bullet projectile embedding handling
Commit b1546ee3eb contained a rather
bone-headed mistake, that resulted in embedding with penetrating
projectiles to not behave as desired.

This commit fixes that, and provides a cleaner implementation.
2015-02-18 18:09:24 -05:00
Raptor1628
2ae273e1b8 Gear again
Collection of gear and changes from the four gear polls on the forums
includes:
2 new automatic weapons, mapped in to ERT and random weapon spawns.
Laser carbine balance.
Slow emergency softsuits, no armor value other than bio and rad, 4
slowdown.
1 knife, not mapped in, available for Psi's uplink merge.
New vests: 2 types, 2 pocket no slowdown,
4 pocket with slowdown, second is available from cargo and one random
vest
spawn in armory. The first replaces all instances of the old vests. Old
vests still exist in code.
Mercenary vest with no slowdown, 4 pockets, and slightly better armor,
not on map, possibly for Nukes or Traitor Uplink
Holster rearrangement for custom loadout.
Acid dispenser, mapped into robotics and science.
New food items, added to vendors and rations crate.
New random medical spawns, added to medbay.
Cargo and loadout additions to accommodate new items.
1 beanbag loaded 5 round shotgun added to Warden's closet to compensate
for officers having .45 ltls and the HoS having an e-gun, suggested by
IRC and server.

http://baystation12.net/forums/viewtopic.php?f=5&t=12064

http://baystation12.net/forums/viewtopic.php?f=5&t=12031

http://baystation12.net/forums/viewtopic.php?f=5&t=12027

http://baystation12.net/forums/viewtopic.php?f=5&t=12007
2015-02-18 15:35:37 -05:00
Akai Alonkai
c6b66a1000 Defines icon file for purple comb
Fixes #8133
2015-02-18 15:09:40 -05:00
Zuhayr
728cb3cffa Working on vines. 2015-02-18 23:37:27 +10:30
PsiOmega
958391d06b Custom ninja spawn points.
The ninja should no longer risk spawning far away from the station, with no clue where to go to reach it.
2015-02-18 08:14:40 +01:00
PsiOmegaDelta
4e785f716a Merge pull request #8160 from mwerezak/stools
Replaces stool structures with stool items
2015-02-18 07:35:54 +01:00
mwerezak
57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
mwerezak
5f700f2f6e Updates human examine description
Updates the human examine description so that the message about not
breathing is shown in more cases when src is not breathing.
2015-02-18 00:18:28 -05:00
mwerezak
6479c909cd Updates grabs
Replaces broken client/Process_Grab(), makes resisting neck grabs
actually work. Fixes the grabbed_by list filling up with null entries
when a grab is broken. Aggressive grabs now prevent movement, can still
be quickly broken using resist or disarm. Neck grabs are easier to
resist if the grabber has moved recently. Some minor cleanup.
2015-02-17 23:40:51 -05:00
Zuhayr
ae1161184c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-18 14:17:39 +10:30
MrSnapwalk
52072bc7cf Adds action figures, large and small plushies, and the toy cult sword. Adds all new toys to the arcade machine. 2015-02-17 20:38:13 -06:00
PsiOmegaDelta
fdc15d98fe Merge pull request #8149 from mwerezak/gun-rewrite
[DNM] Projectile and gun fixes
2015-02-17 16:19:41 +01:00
Chinsky
cba3448227 Fixes a sanity check turned insanity check forcing everyone to go commando. 2015-02-17 17:01:10 +03:00
Chinsky
eb4a75c9b3 Merge pull request #7986 from Hubblenaut/sprites
Adds on-sprite belt icons
2015-02-17 15:22:16 +03:00
Chinsky
e596d45013 Merge pull request #8137 from mwerezak/lexorin
Lexorin cleanup
2015-02-17 11:58:34 +03:00
PsiOmega
ec4b8c78a1 Merge remote-tracking branch 'upstream/dev' into subsystems
Conflicts:
	code/game/machinery/camera/camera.dm
	code/modules/mob/mob.dm
2015-02-17 08:36:12 +01:00
PsiOmega
2e9c266a2f Basic main structure for centralized alarm handling. 2015-02-17 08:34:26 +01:00
mwerezak
b1546ee3eb Fixes projectiles embedding in mobs that they pass through 2015-02-17 01:36:50 -05:00
mwerezak
8c3660357a Projectile penetration fixes
Fixes projectiles Bump()-ing twice when penetrating walls. Fixes
projectiles being unable to penetrate a wall that was destroyed because
it turned into plating.
2015-02-16 23:00:47 -05:00
mwerezak
46ef0a8949 Fixes accuracy not being reset when unzoomed 2015-02-16 23:00:25 -05:00
mwerezak
672709382d Fixes runtime 2015-02-16 23:00:00 -05:00