Commit Graph

907 Commits

Author SHA1 Message Date
duncathan
4475824890 fixes #12143 2015-10-04 07:33:32 -06:00
Razharas
56e1d319c8 Merge pull request #12048 from Incoming5643/faithbemyshield
Makes magic bolts properly unblockable
2015-09-30 23:12:02 +03:00
Razharas
1aa0e911ae Merge pull request #11760 from Core0verload/selfrepair
Cyborgs update
2015-09-30 22:50:08 +03:00
Aranclanos
ba07442a69 Merge pull request #12028 from phil235/AddbloodRuntimeFix
Fixes some runtimes, syndiborg module and  grenade launcher
2015-09-28 06:36:54 -03:00
Incoming
067d59669e Makes magic bolts properly unblockable. Their effects still happened even if they were blocked so this really just amounts to removing a false hope message.
Fixes #12046
2015-09-27 15:21:40 -04:00
Xhuis
5f99b313cc Radiation changes 2015-09-26 13:33:27 -04:00
phil235
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
c0
a687b07eac f u c k c o n f l i c t s 2015-09-25 14:35:44 +03:00
xxalpha
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
xxalpha
655b1a77c7 Replaced refactored is_hot() to be an atom proc. 2015-09-24 01:12:38 +01:00
Razharas
f8e2f721c3 Merge pull request #11877 from Core0verload/suicide
Russian roulette: "Spin the chamber" edition.
2015-09-24 01:44:12 +03:00
Razharas
78e9fe068f Merge pull request #11782 from Jordie0608/bagsofholdingsarejustincompletesingularitygrenades
Rework of adv egun failure mechanic
2015-09-24 01:34:38 +03:00
Xhuis
6711406d6a Conflicts 2/3 2015-09-22 16:37:00 -04:00
Razharas
835da91620 Merge pull request #11883 from phil235/DnaMonkeyStuff
DNA rework
2015-09-22 18:43:27 +03:00
Xhuis
66f67946ae Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff 2015-09-21 22:18:24 -04:00
c0
2d872ac8b4 feedback 2015-09-22 00:20:37 +03:00
c0
93fb95993e Instant merge is the fastest action type for this operation 2015-09-22 00:20:36 +03:00
c0
ef8bb5e0e0 Russian roulette 2015-09-22 00:20:36 +03:00
Jordie0608
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
Aranclanos
6e117f031e Merge pull request #11837 from Steelpoint/GunSprites
Auto Rifle Sprites and Bug Fixes
2015-09-21 03:23:22 -03:00
Steelpoint
422f7ecfe5 Fix 2015-09-21 10:25:27 +08:00
Steelpoint
2f9a37d624 Changes 2015-09-21 10:21:10 +08:00
Swag McYolosteinen
1a5df1d08b Merge pull request #11846 from GunHog/RadsPlzKThxLol
Advanced Energy Gun fixes
2015-09-20 20:36:17 +02:00
Remie Richards
225eee3d2f Merge pull request #11815 from spasticVerbalizer/shootFooting
Makes clumsy misfires actually target a leg
2015-09-20 17:24:24 +01:00
Maarten van den Berg
f3f080693a Adds zone_override var to process_fire and friends, updates clumsy and gun suicide 2015-09-20 16:52:39 +02:00
phil235
6ee5ab6680 Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff
Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/admin/verbs/one_click_antag.dm
2015-09-19 22:34:30 +02:00
phil235
f90ee4aa8c - Fixed monkey starting with no dna.
- Fixed bugs with monkeyize/humanize: 7803 (humanized monkey nobloodtype)
- Fixes 9298 monkeyed ling have troubles humanizing themself (already fixed?)
- Fixes despawning clothes when monkeyizing. 11855
- Replaced check_dna_integrity proc by simpler has_dna proc when required.
- created set_species() proc
- fixed space retrovirus not transfering SE (despite having a domutcheck()). Still need to check if it needs a name = real_name.
- I renamed mecha/var/dna to dna_lock to avoid confusion
- I renamed an armor var in a species proc to armor_block to avoid confusion with species/var/armor.
- I removed many if(dna) checks in lots of files.
- I removed duplicate defense procs between human/proc/X and dna.species/proc/X since dna is now always set.
- Anatomic panacea from changeling removes alien embryo correctly. 6247
- Fixes runtime when trying to put dna-less brain mmi into a dnalocked mech.
- Removed carbon/var/list/features, we now only have dna.features and prefs.features
- Remove hulk mutation from lizards and other species (Fixed 6413); only real humans can acquire hulk. (less work on sprites for each ones, fixes lizard tail not in hulk color)
- Fixes cloning not setting up correctly dna UE and dna.real_name
- I fixed the issue with sucked+cloned ling being unable to absorb
- I fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- I added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.

- Fixes cloning not setting up correctly dna UE and dna.real_name
- Fixed the issue with sucked+cloned ling being unable to absorb
- Fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- Added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.
2015-09-19 22:18:28 +02:00
Xhuis
76b90ef25c Adds a variable, can_unsuppress 2015-09-19 14:25:16 -04:00
Xhuis
f53897523c Conflicts 2/3 2015-09-19 14:07:24 -04:00
Remie Richards
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
Steelpoint
3fb3b49134 Fixes 2015-09-18 20:09:57 +08:00
Steelpoint
a421402cb8 SABR+Sprites+Fixes 2015-09-18 10:38:35 +08:00
GunHog
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
Steelpoint
f054521bbf FixesAndSprites 2015-09-17 11:53:12 +08:00
Xhuis
2e09024f9d Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff 2015-09-16 22:55:54 -04:00
Xhuis
925817539a Traitor item rebalance 2015-09-16 22:55:45 -04:00
Steelpoint
e51eefbe34 MoreChanges 2015-09-16 18:00:21 +08:00
Steelpoint
62e7f1204d NewChanges 2015-09-16 17:53:04 +08:00
Maarten van den Berg
9837ad6ab7 Makes clumsy misfires actually target a leg 2015-09-16 11:11:05 +02:00
bgobandit
0664cffa45 tweaks shit 2015-09-15 21:43:19 -04:00
Jordie0608
f8e836ade4 moves update_icon 2015-09-14 23:30:52 +10:00
Jordie0608
d15a4cff5a rework of adv egun failure mechanic 2015-09-14 23:03:41 +10:00
Steelpoint
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
Jordie
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
Jordie
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
GunHog
34b5dbf5e7 Buffs AE Gun
- Gives Advanced Energy Gun a taser mode.
- Allows them to accept Seclites.
2015-09-10 11:27:30 -05:00
Steelpoint
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
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Steelpoint
98aef2ee6a ExtraValueRemoved 2015-09-10 14:10:48 +08:00
Steelpoint
6eac77fcfd Rifle 2015-09-10 13:14:41 +08:00