Commit Graph

334 Commits

Author SHA1 Message Date
tkdrg
eda3c54d9d Merge pull request #15070 from MMMiracles/instagib
Adds an Instagib Rifle
2016-02-06 08:36:06 -03:00
tkdrg
70a69ae1e7 Merge pull request #15141 from KorPhaeron/practice
Makes practice lasers scarier
2016-02-05 00:58:16 -03:00
KorPhaeron
7ed46468f5 preserves name 2016-02-04 19:41:12 -06:00
tkdrg
058f93a052 Merge pull request #14911 from MMMiracles/L6butbetter
local man rebalances bulldog and SAW, ruins everything
2016-02-04 21:59:28 -03:00
MMMiracles
3679f054b2 bumping on up 2016-02-02 18:35:26 -05:00
MMMiracles
64b09f82e5 outlining on rifle is more defined, made a red and blue variant along with a generic variant. 2016-02-02 18:19:22 -05:00
KorPhaeron
8e9a2e7cb7 Makes practice lasers scarier 2016-02-01 17:46:21 -06:00
MMMiracles
ea3e03ec48 adds a blue variant of the rifle for team-based stuff or something 2016-01-30 01:57:14 -05:00
MMMiracles
cb8e000580 adds instagib rifle 2016-01-30 01:24:56 -05:00
Firecage
d034a3f8ab Compile fix 2016-01-27 13:30:46 +02:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
MMMiracles
045f2d480b saw and bulldog changes fight me kiddo 1v1 2016-01-25 20:58:38 -05:00
KazeEspada
17fe36ebda Merge branch 'master' of https://github.com/tgstation/-tg-station into LizardHunting 2016-01-24 15:14:00 -07:00
KazeEspada
b774041648 Lizards now hunt and kill insects, they swallow them whole.
"We vorestation now." -Iamgoofball.
2016-01-24 15:13:46 -07:00
KorPhaeron
f76d8567c7 Polymorph 2016-01-23 13:03:21 -06:00
Firecage
332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
Firecage
754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
KorPhaeron
a0923daa0e Removes NOSHIELD 2015-12-20 15:21:58 -06:00
MMMiracles
cbc9904c4c saw balance 2015-12-16 20:23:03 -05:00
Razharas
3c0100cbf1 Merge pull request #13291 from GunHog/Nanotrasen_Science_Handheld_Clown_Removal_Device
The Bluespace Wormhole Projector now teleports mobs!
2015-11-30 18:18:22 +03:00
GunHog
09844e6f48 NSHCRD
- The Bluespace Wormhole Projector will now teleport mobs hit by the
projectile!
2015-11-28 16:41:51 -06:00
Cheridan
762568255d Merge pull request #13102 from bgobandit/newmininggear
Various mining additions, fixes, nerfs and buffs (ready for review/merge).
2015-11-26 18:11:26 -06:00
bgobandit
f435f18d6b fixed gunhog's shit, added new KA/res to asteroid rooms, added mesons to mech scanner 2015-11-24 07:18:54 -05:00
bgobandit
bcd456eea1 Added new PKA, R&D designs, tweaked numbers, honked the honk up the honk 2015-11-23 18:44:54 -05:00
Razharas
52ce383102 Merge pull request #13053 from AnturK/doors
Makes staff of doors create random mineral doors.
2015-11-20 06:54:28 +03:00
bgobandit
899e6ecaf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear
Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm
2015-11-18 19:55:06 -05:00
bgobandit
47dcbc2fd0 Various mining additions, fixes and rebalances. 2015-11-18 19:14:28 -05:00
AnturK
b1bf6acab0 Changes spellbook description
Picks types from list
2015-11-17 15:17:46 +01:00
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
AnturK
05ff5552b2 Makes staff of doors create random mineral doors. 2015-11-16 21:10:34 +01:00
phil235
e20e03562a Fixes your shield blocking the bullets when committing suicide with a gun.
Merged kill_count and range var into one var/range for obj/item/projectile.
Simplified projectile/proc/Range().
Fixes timestoped projectiles still calling Range() and thus being deleted despite being stopped.
Fixes projectile being invisible when on the first tile in front of the shooter (which meant no sprite showing when shooting a target 1 tile away)
Simplifies kinetic/Range()
2015-11-12 19:45:50 +01:00
Cheridan
44cca62727 Merge pull request #12805 from KorPhaeron/xray
Xray range tweak
2015-11-10 18:14:47 -06:00
KorPhaeron
015c480e8f Lasertag beams 2015-11-01 20:55:46 -06:00
KorPhaeron
2484266f0b Xray range 2015-11-01 16:53:57 -06:00
Firecage
cc3912bf37 Makes the decloner once more do cloneloss damage 2015-10-28 01:04:04 +02:00
Cheridan
6bfa738a24 Merge pull request #12567 from phil235/EffectSystemTweak
Makes effect system code more OOP.
2015-10-22 21:00:10 -05:00
phil235
21c4552576 Merge pull request #12487 from bgobandit/humanoids
Changes the text human ==> humanoid where applicable.
2015-10-22 00:41:19 +02:00
phil235
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
Razharas
d1df0bfeff Merge pull request #12485 from xxalpha/ultrarange
Added ultra_range() proc.
2015-10-20 00:17:09 +03:00
Cheridan
56b7a7717b Merge pull request #12416 from KorPhaeron/drones
Staff of Change now makes hacked drones
2015-10-19 14:38:16 -05:00
xxalpha
e82a216447 Changed various instances of range() and orange() to ultra_range(). 2015-10-19 20:04:14 +01:00
bgobandit
055427b65c human ==> humanoid where applicable 2015-10-18 13:50:34 -04:00
phil235
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
KorPhaeron
1aa9ed34e7 Staff of Change 2015-10-15 14:46:01 -05:00
duncathan
4475824890 fixes #12143 2015-10-04 07:33:32 -06: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
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
Steelpoint
62e7f1204d NewChanges 2015-09-16 17:53:04 +08:00
Steelpoint
98aef2ee6a ExtraValueRemoved 2015-09-10 14:10:48 +08:00