6bfa738a24
Merge pull request #12567 from phil235/EffectSystemTweak
...
Makes effect system code more OOP.
2015-10-22 21:00:10 -05:00
520fedd2cf
Changed a few gun names
2015-10-22 18:52:40 +02:00
d3ee910211
Makes effect system code more OOP.
...
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
2015-10-21 23:28:29 +02:00
47909d525f
Changes smoke to behave more like foam. Each covered tile has one smoke cloud. This makes smoke clouds much less random, especially in terms of reagent application.
...
Also smoke reaction now uses the TOUCH method instead of VAPOR, to differentiate smoke and foam. Mob without internals or gas masks also ingests reagents in the smoke.
Moved nanofrost smoke code to effects/effect_system/effects_smoke.dm
2015-10-15 21:52:37 +02:00
1aa0e911ae
Merge pull request #11760 from Core0verload/selfrepair
...
Cyborgs update
2015-09-30 22:50:08 +03:00
ba07442a69
Merge pull request #12028 from phil235/AddbloodRuntimeFix
...
Fixes some runtimes, syndiborg module and grenade launcher
2015-09-28 06:36:54 -03:00
5f99b313cc
Radiation changes
2015-09-26 13:33:27 -04:00
1d56ff80dc
Fixes runtimes with add_blood() and add_blood_list()
...
Fixes formatting in the mech control console window.
Fixes runtimes when building an AI (mind transfer from mmi to ai was called before the AI's hud_list was set)
Fixes syndicate cyborg not starting with the correct module.
Fixes syndiborg not being able to use their grenade launcher
Fixes runtime with gun process_fire() (some code was reverted by accident)
Fixes a runtime with hostile simple animal's PickTarget().
2015-09-26 13:21:20 +02:00
a687b07eac
f u c k c o n f l i c t s
2015-09-25 14:35:44 +03:00
22474094ae
Merge remote-tracking branch 'upstream/master' into hot_or_not
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
2015-09-24 03:14:04 +01:00
655b1a77c7
Replaced refactored is_hot() to be an atom proc.
2015-09-24 01:12:38 +01:00
f8e2f721c3
Merge pull request #11877 from Core0verload/suicide
...
Russian roulette: "Spin the chamber" edition.
2015-09-24 01:44:12 +03:00
78e9fe068f
Merge pull request #11782 from Jordie0608/bagsofholdingsarejustincompletesingularitygrenades
...
Rework of adv egun failure mechanic
2015-09-24 01:34:38 +03:00
66f67946ae
Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff
2015-09-21 22:18:24 -04:00
93fb95993e
Instant merge is the fastest action type for this operation
2015-09-22 00:20:36 +03:00
ef8bb5e0e0
Russian roulette
2015-09-22 00:20:36 +03:00
1d9c61702d
Merge branch 'master' of https://github.com/tgstation/-tg-station into bagsofholdingsarejustincompletesingularitygrenades
...
Conflicts:
code/modules/projectiles/guns/energy/nuclear.dm
2015-09-21 17:00:08 +10:00
6e117f031e
Merge pull request #11837 from Steelpoint/GunSprites
...
Auto Rifle Sprites and Bug Fixes
2015-09-21 03:23:22 -03:00
2f9a37d624
Changes
2015-09-21 10:21:10 +08:00
1a5df1d08b
Merge pull request #11846 from GunHog/RadsPlzKThxLol
...
Advanced Energy Gun fixes
2015-09-20 20:36:17 +02:00
225eee3d2f
Merge pull request #11815 from spasticVerbalizer/shootFooting
...
Makes clumsy misfires actually target a leg
2015-09-20 17:24:24 +01:00
f3f080693a
Adds zone_override var to process_fire and friends, updates clumsy and gun suicide
2015-09-20 16:52:39 +02:00
76b90ef25c
Adds a variable, can_unsuppress
2015-09-19 14:25:16 -04:00
f53897523c
Conflicts 2/3
2015-09-19 14:07:24 -04:00
82a79a1705
Merge pull request #11787 from bgobandit/theywanttherandd
...
Adds origin tech values to a lot of items.
2015-09-19 14:20:09 +01:00
a421402cb8
SABR+Sprites+Fixes
2015-09-18 10:38:35 +08:00
2b7bebb523
Advanced Energy Gun fixes
...
- AE gun can once again be researched more easily by forcing it to
critically fail.
- Fixed reliability rating being able to become negative.
2015-09-17 10:29:03 -05:00
f054521bbf
FixesAndSprites
2015-09-17 11:53:12 +08:00
2e09024f9d
Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff
2015-09-16 22:55:54 -04:00
925817539a
Traitor item rebalance
2015-09-16 22:55:45 -04:00
e51eefbe34
MoreChanges
2015-09-16 18:00:21 +08:00
0664cffa45
tweaks shit
2015-09-15 21:43:19 -04:00
f8e836ade4
moves update_icon
2015-09-14 23:30:52 +10:00
d15a4cff5a
rework of adv egun failure mechanic
2015-09-14 23:03:41 +10:00
5783cdda03
Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-13 20:00:41 +08:00
15e50de0fe
Merge pull request #11694 from bear1ake/point-zero
...
Remove a bunch of useless .0 in vars
2015-09-13 21:47:09 +10:00
f02589180d
Merge pull request #11698 from GunHog/MaybeNowSecWillWantThem
...
Added a taser function back to the Advanced Energy Gun
2015-09-13 21:42:45 +10:00
34b5dbf5e7
Buffs AE Gun
...
- Gives Advanced Energy Gun a taser mode.
- Allows them to accept Seclites.
2015-09-10 11:27:30 -05:00
5a5bcbbbd7
Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
...
Conflicts:
code/game/gamemodes/changeling/powers/mutations.dm
2015-09-10 23:18:39 +08:00
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
6eac77fcfd
Rifle
2015-09-10 13:14:41 +08:00
304d91fa2c
Merge pull request #11606 from Firecage/gunnames
...
This gives most projectile guns less generic names.
2015-09-09 10:45:18 -05:00
2a90cd109e
Stetchkin pistol rename.
2015-09-09 17:36:14 +02:00
a48610fbb9
MinorCHange
2015-09-08 23:20:15 +08:00
d6f0c2484a
InitalCommit
2015-09-08 19:56:07 +08:00
42a28af718
Updated gun names.
2015-09-07 10:06:14 +02:00
63657bb2e7
Adjusts some gun names like sugggested.
2015-09-06 18:09:42 +02:00
1b119f6aef
Fixes the russian revolver name, my mistake.
2015-09-06 14:30:43 +02:00
56925928eb
places /improper in the gun names.
2015-09-06 14:27:54 +02:00
9c341fb128
This gives most projectile guns less generic names.
2015-09-06 13:43:38 +02:00
Cheridan
KorPhaeron
phil235
phil235
Razharas
Aranclanos
Xhuis
c0
xxalpha
Jordie0608
Steelpoint
Swag McYolosteinen
Remie Richards
Maarten van den Berg
GunHog
bgobandit
bear1ake
Firecage