Commit Graph

5046 Commits

Author SHA1 Message Date
Zuhayr
0c206344b6 Master<dev 2015-02-21 19:57:31 +10:30
Zuhayr
2ecd76b07f Master merge. 2015-02-21 19:51:28 +10:30
Zuhayr
2139884244 Dev merge. 2015-02-21 19:49:47 +10:30
Chinsky
81599a9203 Merge pull request #8175 from Kelenius/ofBorgsAndSynths
Adds robot synths
2015-02-21 11:43:39 +03:00
Chinsky
2b2332cfc1 Merge pull request #8157 from mwerezak/gun-rewrite
Better handling of mob projectile passthrough and embedding + some gun tweaks
2015-02-21 07:52:58 +03:00
Chinsky
6bd495fc47 Merge pull request #8164 from PsiOmegaDelta/NanoAir
Air Alarm and Atmospheric Controller NanoUI
2015-02-21 07:51:01 +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
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
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
mwerezak
1258517202 Fixes hiding mobs being layered underneath vents 2015-02-19 01:02:32 -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
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
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
PsiOmegaDelta
fdc15d98fe Merge pull request #8149 from mwerezak/gun-rewrite
[DNM] Projectile and gun fixes
2015-02-17 16:19:41 +01: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
Zuhayr
bee187d5bc Merge pull request #8143 from PsiOmegaDelta/NanoAI
AI NanoUI subsystems.
2015-02-17 11:50:59 +10:30
Hubblenaut
5ffa0e6397 fixes curbstomp, adjusts texts 2015-02-17 00:18:54 +01:00
Zuhayr
32965840c6 Merge pull request #8145 from PsiOmegaDelta/MultiPad
Allows multiple AIs to share holopad.
2015-02-17 03:33:33 +10:30
PsiOmega
f248d7de35 Allows multiple AIs to share holopad. 2015-02-16 17:55:26 +01:00
Zuhayr
4631e53718 Merge pull request #8140 from comma/undies
Underwear closet, crossdressing
2015-02-17 03:03:45 +10:30
Hubblenaut
5eca5d9e37 Merge remote-tracking branch 'upstream/dev' into sprites
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2015-02-16 16:16:30 +01:00
PsiOmega
06335b1064 The AI now has a personal power monitor interface. 2015-02-16 15:12:23 +01:00
PsiOmega
9cd0714c2c The AI now has a personal crew monitor interface. 2015-02-16 14:18:18 +01:00
PsiOmega
c6d88bc787 AI NanoUI subsystems.
Allows sharing of NanoUI code between consoles and the AI (and just about anything else).
2015-02-16 13:44:04 +01:00
Neerti
dfc7762677 Small optimization to procs and the panel. 2015-02-16 05:14:38 -05:00
Zuhayr
9c45f000ec Merge with dev. 2015-02-16 20:34:07 +10:30
PsiOmegaDelta
8e0b2a0235 Merge pull request #8139 from mwerezak/fingerprints
Adds fingerprints whenever an item is put in a human's hands
2015-02-16 10:35:01 +01:00
Chinsky
f9ba327c3a Merge pull request #8099 from mwerezak/gun-rewrite
Gun rewrite
2015-02-16 11:54:52 +03:00
Chinsky
541bcd757e Merge pull request #8141 from Baystation12/master
master -> dev
2015-02-16 11:53:14 +03:00
Chinsky
3f8462a399 Adds a wardrobe structure to pick your underwear.
Adds ability to wear female underwear as male and vice versa.
Changes 'underwear'/'undershirt' vars to hold iconstate instead of esoteric dances with array indexes.
2015-02-16 11:17:22 +03:00
mwerezak
e5d14465b0 Adds fingerprints whenever an item is put in a human's hands. 2015-02-16 02:26:17 -05:00
Neerti
9612bc183b Cleans up my comments. 2015-02-16 00:06:46 -05:00