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
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
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
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
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
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
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
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
Zuhayr
77177b514f
Working on spores.
2015-02-14 10:30:06 +10:30
Zuhayr
5e87b21d44
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-14 09:32:17 +10:30
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
Zuhayr
232c2c93e2
Fixes infinite loop issues with plant controller.
2015-02-13 10:56:52 +10:30
Zuhayr
066482de93
Readds predefined ambrosia items.
2015-02-13 05:53:45 +10:30
Zuhayr
15e666150e
Readded pumpkin carving and poultice making. Added a description generator and cache.
2015-02-13 05:02:21 +10:30
Zuhayr
8fb5836e4f
Generalized fruit products properly.
2015-02-13 03:52:46 +10:30
RavingManiac
b14e76f4a0
Fixed compilation error.
2015-02-13 00:56:01 +08:00
RavingManiac
98dd5c46c0
Circulators now draw air based on the total volume of the pipe network connected to the input. They also generate some power in the same manner as pipe turbines.
...
Thermoelectric generators now generate much more power, mostly due to the increase in circulator intake volume.
Supermatter no longer powers radiation collectors, and is tweaked to run at 4000-6000K.
TEG supermatter engine mapped in. Currently generates ~1MW of power with chamber temperature of 5000K.
2015-02-13 00:38:23 +08: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
