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
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
MrSnapwalk
0d8537700c
Adds the Bosun's Whistle.
2015-02-15 17:38:27 -06: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
Neerti
e75a4ebbc8
Updates comments to be accurate. Fixes typo in drone desc_info.
2015-02-13 04:01:44 -05: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
Neerti
d289997a0c
Adds a new tab, which displays additional information about possibly anything you examine, assuming someone adds text to it. Additional info on the PR.
2015-02-13 02:26:45 -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
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
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
Zuhayr
a8089d4437
Merge master into dev.
2015-02-12 23:01:08 +10:30
PsiOmega
cb82dd950e
Adds a floppy disk which provides access to the station camera network given appropriate hardware.
2015-02-12 12:20:58 +01:00
Zuhayr
d40eecd163
Merge pull request #8117 from mwerezak/textmacros
...
Replaces text expressions with macros
2015-02-12 18:49:16 +10:30
Zuhayr
0955b001dc
Merge pull request #8114 from mwerezak/hydrofix
...
Fixes randomized seed nutrient_consumption
2015-02-12 18:48:11 +10:30
PsiOmegaDelta
baf6a6f859
Merge pull request #8112 from DeeUnderscore/vendor-cash
...
Vending machines: NanoUI, cash and other stuff
2015-02-12 09:08:29 +01:00
mwerezak
5b5e16916f
Replaces text expressions with macros
2015-02-12 01:55:12 -05:00
mwerezak
1e9143a1f0
Reorganizes launcher source files
2015-02-12 01:38:54 -05:00
mwerezak
628bc5eecc
Crossbow strings no longer magically pull back by themselves
2015-02-12 01:38:03 -05:00
mwerezak
5ab6b91c5e
Generalizes emp energy weapon drain to power cells
2015-02-12 01:37:41 -05:00
mwerezak
ea39f7f718
Cleanup can_fire(), projectile flag
...
Removes can_fire() and moves some of it's functionality into
get_next_projectile(), which was renamed to consume_next_projectile() to
indicate the possibility of side-effects.
Also renamed flag var to check_armour
2015-02-12 01:37:19 -05:00
PsiOmegaDelta
d8b9b024be
Merge pull request #8115 from mwerezak/powerfix
...
Fixes machines being usable after a power failure
2015-02-12 06:41:29 +01:00
