Chinsky
e596d45013
Merge pull request #8137 from mwerezak/lexorin
...
Lexorin cleanup
2015-02-17 11:58:34 +03: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
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
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
7f19a8a77b
Tweaks bullet penetration
2015-02-16 03:04:48 -05:00
mwerezak
e5d14465b0
Adds fingerprints whenever an item is put in a human's hands.
2015-02-16 02:26:17 -05:00
mwerezak
500ca93278
Fixes guns being unremovable
...
Fixes certain guns being unremovable due to unloading ammo taking
precedence over picking up. Also adds on-back icon for the merc sniper
which is just a copy of the LWAP's.
2015-02-16 01:47:07 -05:00
mwerezak
c20986b140
Fixes quoted paths
2015-02-16 01:12:43 -05:00
mwerezak
83780ef550
Adds sts-35 automatic rifle
2015-02-16 01:12:16 -05:00
mwerezak
3c1ec28a37
Reorganizes colt pistols, moves renaming verb
2015-02-15 23:32:35 -05:00
mwerezak
2a4d1b08cd
Fixes beakers splashing onto the dart gun when being loaded.
2015-02-15 20:27:45 -05:00
mwerezak
d75379d6af
Lexorin causes losebreath instead of oxyloss
...
Makes lexorin actually do what it's description says, now less deadly as
a side effect.
2015-02-15 19:12:26 -05:00
SkyMarshal
03e8acd957
Fixes errors in energy/special.dm
2015-02-15 10:45:34 -07: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
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
13ca926c0f
Fixes throwing miss chance using min instead of max
...
Also adjusted slightly to make throwing a bit more distinct from
projectile weapons. Throwing is worse with range but better up close.
2015-02-14 22:12:42 -05:00
mwerezak
cd81f0b706
Improves gun scope zooming
2015-02-14 22:12:16 -05:00
mwerezak
a6095a3610
Updates L6 SAW
...
Also changes src in user checks, probably unnecessary.
2015-02-14 22:09:19 -05:00
GinjaNinja32
dafcc2a374
Fixes runtime when walking over shards with no shoes
2015-02-14 23:29:11 +00:00
GinjaNinja32
9c68bd492d
Adds current color as default to hair, facial hair, eye and skin color pickers
2015-02-14 21:49:45 +00:00
mwerezak
f54588675f
Fixes soporific and chloral hydrate
...
Soporific now makes people fall asleep, as intended. CH now knocks
people out after 20 seconds, instead of after 3 minutes.
2015-02-14 13:51:10 -05:00
mwerezak
e5f8ac50b4
Rewrites grenade launchers
2015-02-14 13:39:11 -05: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
8cb3c6a821
ammo_magazine icon state data caching
2015-02-14 01:33:55 -05:00
mwerezak
e3be255f59
Adds dart gun projectile sprite, dart gun fixes
2015-02-14 01:33:15 -05:00
mwerezak
2b8cd929a7
Adds accuracy modifier support
2015-02-14 00:54:06 -05: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
RavingManiac
cc62c987ea
Some TEG refactoring and UI improvements
...
"circulator/heat exchanger" is now just called "circulator"
2015-02-13 18:34:48 +08:00
PsiOmega
dc1774e23b
Adds missing Event cost stat.
2015-02-13 09:43:18 +01:00
RavingManiac
71902cdca2
Tweaked descriptions and settings of various TEG components.
...
Maximum power of core vent and injector increased.
2015-02-13 16:08:52 +08: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
PsiOmegaDelta
0d08264e5e
Merge pull request #8120 from GinjaNinja32/crewmonitor
...
Fixes template modification exploit for crew monitoring computer
2015-02-12 21:36:16 +01:00
GinjaNinja32
189330b4b3
Fixes template modification exploit for crew monitoring computer
2015-02-12 20:27:28 +00:00
PsiOmega
d4ae710c0c
Tweaks and corrections.
2015-02-12 21:11:38 +01:00
