Commit Graph

4203 Commits

Author SHA1 Message Date
mwerezak
47cbfdd59e Keeps zone selection and gun mode toggle HUD elements visible when scoped 2015-02-21 16:01:47 -05:00
mwerezak
11719a380e Fixes #8151 2015-02-21 15:49:52 -05:00
Chinsky
4daf7161ad Merge pull request #8191 from PsiOmegaDelta/NanoFix
Fixes runtime in Topics() when called from non-NanoUI sources.
2015-02-21 14:34:09 +03:00
PsiOmega
89da19de8a Fixes runtime in Topics() when called from non-NanoUI sources. 2015-02-21 10:32:20 +01:00
Zuhayr
0c206344b6 Master<dev 2015-02-21 19:57:31 +10:30
Chinsky
81599a9203 Merge pull request #8175 from Kelenius/ofBorgsAndSynths
Adds robot synths
2015-02-21 11:43:39 +03:00
Chinsky
214324eaaf Merge pull request #8156 from PsiOmegaDelta/CameraMove
Custom ninja spawn points.
2015-02-21 11:43:19 +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
MrSnapwalk
ee24bdb3b1 Adds the spider plushie - sprite by Bishop. 2015-02-20 21:17:46 -06:00
MrSnapwalk
cf431370f3 Action figure un-refactor, minor fix. 2015-02-20 21:02:26 -06:00
PsiOmega
5b299e0104 NanoUI atmosphere control and remote air alarm support. 2015-02-20 17:39:55 +01:00
Kelenius
a0b73140e9 Fixes for synths and decompiler 2015-02-20 13:32:10 +03:00
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
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
mwerezak
01784d8d6a Fixes cigar/pipe mob overlays not updating when lit 2015-02-19 00:44:11 -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
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
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
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
Chinsky
eb4a75c9b3 Merge pull request #7986 from Hubblenaut/sprites
Adds on-sprite belt icons
2015-02-17 15:22:16 +03:00
Zuhayr
bee187d5bc Merge pull request #8143 from PsiOmegaDelta/NanoAI
AI NanoUI subsystems.
2015-02-17 11:50:59 +10:30
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
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
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
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
mwerezak
3c1ec28a37 Reorganizes colt pistols, moves renaming verb 2015-02-15 23:32:35 -05:00
MrSnapwalk
0d8537700c Adds the Bosun's Whistle. 2015-02-15 17:38:27 -06:00
RavingManiac
2ebf834b9b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-02-15 22:37:55 +08:00
RavingManiac
50d0fd0bc6 Changed supermatter engine manual for thermoelectric engine.
Expanded supermatter engine radiator bank. Incinerator disposals outlet moved slightly to prevent collision. Supermatter radiator circulator pump changed to a high-powered pump.

Supermatter critical temperature lowered to 5000K.
2015-02-15 22:16:36 +08:00
Zuhayr
be2b0aa6f4 Merge pull request #8135 from Baystation12/master
Master into dev.
2015-02-15 22:03:43 +10:30
mwerezak
ad24aa8e47 Adds mercenary sniper rifle
Adds the scoped mercenary sniper rifle and ammunition defines. Does not
add syndicate uplink option.
2015-02-14 22:33:43 -05:00
mwerezak
cd81f0b706 Improves gun scope zooming 2015-02-14 22:12:16 -05:00
GinjaNinja32
dafcc2a374 Fixes runtime when walking over shards with no shoes 2015-02-14 23:29:11 +00:00
mwerezak
08635587e1 Fixes revolver paths, span classes, typo. Cleans exodus-1.dmm
Tweaks syringe gun and dart gun, renames syringe gun cartridges and makes them printable.
Adjusts penetration so that passing through mobs happens with a probability that scales with damage.
Adds a .45 signal pistol to the HoP's closet and a 9mm one to the mercenary shuttle.
2015-02-14 13:38:05 -05:00
PsiOmega
fde03b2e94 Containers now properly checks types instead of string paths.
Security and medical belts could contain now no longer existing objects. These types have been removed.

Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
	code/game/objects/structures/inflatable.dm
	code/modules/clothing/under/ties.dm
2015-02-14 14:16:40 +01:00
mwerezak
f8977c65af Much nicer syringe gun implementation
Makes syringe guns a type of launcher gun, and removes the hack
projectile.
Also moves syringe and dart gun source files into the modules/projectile
folder.
2015-02-13 23:48:35 -05:00
mwerezak
0d89717cf2 Merge remote-tracking branch 'upstream/dev' into gun-rewrite
Conflicts:
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/projectile/pistol.dm
2015-02-13 01:57:19 -05:00
mwerezak
01798c98b6 Rewrites syringe and dart guns 2015-02-13 01:34:35 -05:00
Chinsky
9dd282e43b Merge pull request #8105 from PsiOmegaDelta/SyndicateDedLongLiveSyndicate
New traitor items
2015-02-13 08:22:28 +03:00
PsiOmega
d4ae710c0c Tweaks and corrections. 2015-02-12 21:11:38 +01:00
PsiOmega
f8c5cf8f83 Adds a kit with cigarette packs and zippo lighter.
Includes 2 packs of flash powder cigarettes, 2 packs of smoke creating cigarettes, 1 pack of mindbreaker cigarettes, and 1 pack of tricordrazine cigarettes.
2015-02-12 16:35:49 +01:00
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30