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
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
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
mwerezak
630369b9dd
More flash shell tweaks, autolathe recipes
...
Tweaks the flash shell some more.
Tweaks shotgun stun shells, adds spent icon.
Additional autolathe ammo recipes.
2015-02-11 22:48:21 -05:00
mwerezak
5740f52964
Merge branch 'guns' into gun-rewrite
...
Conflicts:
code/modules/clothing/suits/armor.dm
code/modules/clothing/under/ties.dm
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/energy/laser.dm
code/modules/projectiles/guns/energy/nuclear.dm
code/modules/projectiles/guns/energy/pulse.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/projectile.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/projectiles/guns/projectile/launcher.dm
code/modules/projectiles/guns/projectile/shotgun.dm
2015-02-11 18:08:43 -05:00
mwerezak
611a42bb33
Gun cleanup and rewrite
...
Rewrites gun.dm. Reorganizes the firing procedure into logical procs and cleans up some unnecessary variables or demotes them to the subtypes that actually care. Energy weapons that create their own projectiles no longer care about in_chamber. Launcher support is much more natural now.
Cleans up duplicated cyborg energy weapon power supply code. Adds support for energy weapons to recharge from external power sources, unifying cyborg and hardsuit mounted weapons. Incorporates the cyborg taser recharging mechanism. Cleans up laser tag gun duplication
Changes path strings to actual paths. Changes relative paths to absolute paths.
Renamed several targeting vars to make their purposes more clear.
Fixed targeting not handling firing correctly for certain subtypes.
2015-02-11 15:46:09 -05:00
PsiOmega
49b1280b13
Tries to add more helpful information when examining a spy bug from real up close.
2015-02-11 21:39:42 +01:00
PsiOmega
73bc5934d5
Replaces uplink Donk-pockets with Sin-Pockets.
...
Sin-Pockets can be self-heated using the future magic of producing heat by mixing chemicals.
Each heated pocket contains: Doctor's Delight - 5 units, Hyperzine - 5 units, Synaptizine - 1 unit.
Overconsumption is definitely possible by the careless.
Makes the concealed cane use non-del methods.
2015-02-11 09:55:50 +01:00
Zuhayr
605c1eea88
Merge pull request #8101 from PsiOmegaDelta/MedCam
...
Map Fixes and Additions.
2015-02-11 15:13:20 +10:30
mwerezak
ab6f0bf30c
Merge remote-tracking branch 'upstream/dev' into gun-rewrite
...
Conflicts:
code/modules/clothing/under/ties.dm
code/modules/projectiles/projectile.dm
2015-02-10 20:59:22 -05:00
mwerezak
bf24ac82b8
Removes IsHandgun() proc, adds slot flag
2015-02-10 20:25:41 -05:00
mwerezak
ee894d6b99
Flash projectile adjustment
...
Adjusts brightness, adds some effects, adds 9mm flash rounds and pistol
variant.
2015-02-10 19:54:30 -05:00
PsiOmega
3a6c4dacd6
Adds 9mm gun with silencer, 5TC, with the option to acquire additional ammo, 2TC.
2015-02-10 22:39:40 +01:00
PsiOmega
0daf1c2539
Merge remote-tracking branch 'upstream/dev' into SyndicateDedLongLiveSyndicate
2015-02-10 21:32:45 +01:00
PsiOmega
d0a59bcd03
Adds a health section in the uplink.
...
Box of donk-pockets for 1 TC.
Combat medical kit, containing bicardine, dermaline, dexalin plus, dylovene, tramadol, and spaceacillin, for 5 TC.
2015-02-10 21:29:29 +01:00
Chinsky
d1de94c70e
Merge pull request #8082 from Kelenius/ofMachinesAndParts
...
Update for machine upgrades and some science
2015-02-10 23:24:19 +03:00
PsiOmega
02dc9e3008
Lightly boosts the clerical kit.
...
Adds destination tagger, wrapping paper, hand labeler, and the ability to select pen color.
2015-02-10 20:12:32 +01:00
PsiOmega
8ceaa8b5a1
Traitors can now order a spy kit
...
Traitors can now order a spy kit containing 3 camera+radio bugs + a monitor for 2 telecrystals.
2015-02-10 19:33:02 +01:00
Kelenius
1368707150
Borg charger now uses cell
2015-02-10 14:39:54 +03:00
PsiOmega
005f8ef405
Adds passive aggressive NanoTrasen balloon.
2015-02-10 12:17:25 +01:00
PsiOmega
cd5a2fc52e
Bonus: Makes the tinted windows respect power failures.
2015-02-10 10:16:58 +01:00
Chinsky
712b952985
Merge pull request #8089 from GinjaNinja32/pai
...
NanoUI pAI, more modular pAI software
2015-02-10 10:05:20 +03:00
PsiOmegaDelta
79aacd9f30
Merge pull request #8081 from comma/maximumtrinkets
...
Accessories update.
2015-02-10 06:51:30 +01:00
PsiOmegaDelta
973bc1c0f3
Merge pull request #8071 from RKF45/newpaint
...
Generic Paint II: Fun with Paint
2015-02-10 06:48:32 +01:00
mwerezak
fc6dfb5f1b
Ammo magazine and casing update
...
Rewrites ammo magazines and casings to be a bit more logical.
Updates gun/projectile and all subtypes to work with the new ammo code.
2015-02-09 21:32:49 -05:00
PsiOmegaDelta
ec1fe5edc7
Merge pull request #8090 from comma/master
...
Fixes #8009
2015-02-09 08:38:50 +01:00
