Commit Graph

9974 Commits

Author SHA1 Message Date
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
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
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
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
Atlantiscze
2d4926f72d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power 2015-02-17 16:05:47 +01:00
Chinsky
eb4a75c9b3 Merge pull request #7986 from Hubblenaut/sprites
Adds on-sprite belt icons
2015-02-17 15:22:16 +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
c804d818fd Fixes rocket launcher icon
Also makes the missiles a little bit less of a joke.
2015-02-16 22:59:35 -05:00
Zuhayr
bee187d5bc Merge pull request #8143 from PsiOmegaDelta/NanoAI
AI NanoUI subsystems.
2015-02-17 11:50:59 +10:30
Zuhayr
f41e955ada Merge pull request #8142 from PsiOmegaDelta/MapMap
Map Changes
2015-02-17 11:50:38 +10:30
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
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
Zuhayr
2f8aa744bc Well now the microwave works except for anything involving fruit. I hate this code. 2015-02-16 21:11:54 +10:30
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
PsiOmega
12077ebeee Map Changes
* Removes a few cameras in storage areas.
* Bolted vault doors now have a proper instance.
* Updates a few access issues noted during testing as well as fixes #7925.
* Restores baystation12.int.
2015-02-16 10:33:32 +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
f2f893d42a Replaces the three atom procs with just one and a datum-based system. 2015-02-15 23:52:39 -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
PsiOmega
a48545391a Fixes out of memory runtime errors and excessive HTML parsing.
Announcements are no longer parsed twice, avoiding messages such as "T's nice".
Fixes the strip_html_properly proc, to avoid out of memory runtimes.
2015-02-15 18:03:25 +01: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
32813af228 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-15 22:04:07 +10:30
Zuhayr
be2b0aa6f4 Merge pull request #8135 from Baystation12/master
Master into dev.
2015-02-15 22:03:43 +10:30
Zuhayr
3fc9c0aec7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-15 22:03:17 +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
Zuhayr
d0b4f9de8a Merge branch 'xenohydro' of https://github.com/Zuhayr/Baystation12 into xenohydro 2015-02-14 23:44:01 +10:30
Zuhayr
3b7555c6e0 WIP 2015-02-14 23:43:52 +10:30