Atlantiscze
2d4926f72d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power
2015-02-17 16:05:47 +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
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
mwerezak
9b3ab4358d
Fixes empty casings not being ejected or cycled
2015-02-16 22:59:11 -05:00
mwerezak
2791a93bf2
SAW and c20r fixes
...
Fixes SAW unloading. Fixes c20r and SAW icon states. Tweaks sniper desc, and makes clip icons for 7.62mm ammo less pixelated - still pretty much a codersprite though. Fixes ptrs item_state.
2015-02-16 22:54:09 -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
Zuhayr
8b9cf94e2e
Readded icon for water flower.
2015-02-16 22:18:12 +10:30
Zuhayr
cf0a358ad6
KITCHEN CODE IS WORKING. YES. I CAN DIE NOW.
2015-02-16 22:11:59 +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
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
Neerti
9612bc183b
Cleans up my comments.
2015-02-16 00:06:46 -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
mwerezak
69284990a3
Merge remote-tracking branch 'upstream/dev' into runtime
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/cat.dm
2015-02-15 22:24:36 -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
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
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
