Commit Graph

403 Commits

Author SHA1 Message Date
kevinz000 0073ffc45d naming 2016-06-04 02:45:43 -07:00
kevinz000 8b79a21698 why 2016-06-04 02:39:38 -07:00
kevinz000 4b2077fd6b fortheloveofallthatisholyworkplease 2016-06-04 02:30:38 -07:00
Mike Long 2a464a3e42 Neatens code 2016-06-01 19:48:14 -04:00
Mike Long 5c6a2490af Bolt of resurrection no longer runtimes on hitting non-mobs. 2016-06-01 19:11:37 -04:00
TechnoAlchemist 6878e9fddb Adds luminosity to lasers and sparks. (#18090) 2016-05-31 21:18:09 -05:00
Lularian 8aa135f470 fixes some of the crap maybe 2016-05-28 11:08:46 -05:00
Cheridan a43394278f Merge pull request #17963 from PKPenguin321/patch-5
removes duplicate definition
2016-05-27 20:51:33 -05:00
Joan Lung 2cfb2d8eed Layers are now defines (#17949)
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
2016-05-27 22:16:21 +02:00
PKPenguin321 238971e1a8 removes duplicate definition
Fixes https://github.com/tgstation/tgstation/issues/17961
2016-05-26 17:34:40 -07:00
Jack Edge bc113b6aa2 Refactors NOREACT flag; minor cig refactor
The reagents datum now has its own flags, which currently includes
REAGENT_NOREACT, which functions in the same way. Shouldn't be touched
directly, use set_reacting(bool) to modify it, as modification also adds
or removes the reagents datum from the SSobj.processing list.

Also refactors cigs a little, adds a Destroy(), uses the open_flame()
proc for the hotspot exposure.
2016-05-26 10:12:59 +01:00
Jack Edge d29af3a94b Independent blobbernauts 2016-05-24 17:28:34 +01:00
Jack Edge afd9720abc Polymorph bugs, time since death, groundwork laid
🆑 coiax
fix: Fixes bug where bolt of change to the host would kill an attached
guardian.
fix: Fixes bug where bolt of change to laughter demon would not release
its friends.
fix: Fixes bug where bolt of change to morphling would not release its
contents.
fix: Fixes bug where bolt of change transforming someone into a drone
would not give them hacked laws and vision.
rscadd: Medical scanners now inform the user if the dead subject is
within the (currently) 120 second defib window.
/🆑

- Also laid the groundwork for force pushing ghosts back into bodies
when defibbing, along with standardising the ghost back into body
process.
- Defib limit and defib brain loss times are now #defines.
2016-05-24 17:28:34 +01:00
AnturK 895406cd36 Merge pull request #17428 from Dahka/New_Syringes
Adds three new syringes
2016-05-24 17:37:40 +02:00
oranges ed80a9d1fd Merge pull request #17816 from Core0verload/fix_pack
Humble Fix Bundle
2016-05-24 09:26:03 +12:00
oranges 4dd328a9fa Merge pull request #17355 from kevinz000/KeepersOfThePeace
Peacekeeper Borgs
2016-05-23 12:32:06 +12:00
c0 8865c15ebe Consistency path change 2016-05-21 06:59:20 +03:00
c0 1af2a4722c Humble Fix Bundle 2016-05-21 04:05:32 +03:00
Lularian d8af0ac003 pixel projectiles dream 2016-05-16 21:26:20 -05:00
phil235 dd2c91ca64 two tiny fixes (#17658) 2016-05-16 10:03:57 -05:00
kevinz000 7895f0be9f Nerfs 2016-05-13 21:42:04 -07:00
Cruix d97b15ef8d Fixed some foam dart bugs (#17563)
* Fixed foam darts being reset when fired
Added the ability to remove pens from foam darts
Foam darts with pens inside them are no longer destroyed on being fired

* Fixed foam dart duplication bug

* Added destroy procs to projectiles and foam darts.
2016-05-13 13:27:19 +02:00
paprika a45ea3293f Merge branch 'master' of https://github.com/tgstation/-tg-station into PixelProjectiles 2016-05-11 19:18:50 -07:00
Incoming5643 2368de554f Healing wand/staff regenerate limbs on use (#17532)
* Fully_heal regenerates limbs

* Working in the browser is such a bad idea

* Seriously not a great idea

* Don't do this at home kids
2016-05-11 19:27:18 -05:00
Jordie a406abfaa7 new sprites for tesla gun (#17509) 2016-05-09 11:40:32 -05:00
lordpidey 24f47b0223 Devil Antag Round 2. (#15794)
* Re-making the branch and PR of demon.  See #15118 for the old PR

* Adds toy demonologist to arcade machine reward list.

* Implemented two suggestions: Pitchfork now has a demonic subtype, to potentially give botanists a normal pitchfork.

Suiciding with signed contract now uses forcesay instead of say.

* Fixes compile errors.
Re factors contracts to be subtypes rather than datums.  <--- incomplete, still need to summon them appropriately.

* buffed infernal power contract to give passive healing
Nerfed magic power contract to not give robeless MM

* Fixes compile errors

* Corrects orientation of true demon sprite

* Begins work on the sNPC for the true demon/ arch-demon

* Added funeral garment sprites.  These will be used in banishment rituals (hopefully)

* Stashing my work so I can move to another computer.

Re-working the true-demon, it will be a carbon rather than a simple mob.

* Revert "Stashing my work so I can move to another computer."

This reverts commit e8b1e032997b7e17af4ad8630bf21d3620195c4e.

* Git exploded for me, so I have to make a new branch with EVERYTHING.  sorry.

* Fixes compile error

* Ghosts can now click on an arch demon to become a slaughter demon

* Begins to convert demons into a carbon rather than simple mob.

* Demons now resurrect if not banished.

* Beepsky now properly tells security chat about the level 666 threat.

* Contracts now work again.

* old spells now get removed properly.

* adding pitchfork sprites

* Adds hud for the true-demon.  Not functional.

* Fixes another error in the demon hud.  Still broken.

* Demons are no longer immortal, demon huds work properly now.  (it's barebones, but it works.)

* Fixes the "Have mortals sign at least # contracts of TYPE" objective

* Fixed typo in banishlore() and updated wrath/envy sintouch objectives.

* Adds huds for demons/sintouched/soulless, however they are currently unused.

* Updates the demon's hud to work with the recent hud changes.

* Cleaned up infernal jaunt, it works a lot better now and is less buggy.

* Revival contracts now actually take your soul.

* Fixes #16513

* Replaces the infinite slaughter demons with infinite imps.  Sprites for imps are still needed.

* Adds sprite for imps.  It's a redder, smaller slaughter demon.

* Fixes lack of icon for pitchforks

* Gives summon wealth a more appropriate icon.

* Fixes small part I forgot to merge.

* Fixes a few bugs with demonic resurrection.  It's still very buggy.

* Derp, my bad, I didn't mean to admin myself on the main server.

* Fixes edge case of demonic resurrection failing.  Debraining the demon is NOT supposed to be an alternative for the banishment ritual.

* Also did not mean to change this config file.

* Fixes another error in type 1 demonic resurrection.  It works properly now.

* Updates employment contract text.

* Fixes type 2 resurrections.
Demonic contracts are once again permanently on fire.

* Replaces toy demonologist with toy demonomicon.  It still works the same, just different icon/name.

* Adds demonomicon and employment cabinet to box/meta/dream/efficiency.

I could not add it to mini/bird due to conflicts.

* Edits ministation and BirdStation to have demonomicons and employment cabinets.

* Fixes spelling error

* Adds burial garments to maps.

* Update photocopier.dm

Fixes the span when inserting items into photocopier

* Fixes disrupt_spells proc

* Makes a lot of changes as reccomended by Remie.

* Fixes a compile error.

* Updates the lawify/loreify to be lists.  Does not compile.

* Fixes compile errors.

* Arch demons no longer regress upon death.
Speaking a demon's truename gives the demon the opportunity to teleport to you.
Makes demonomicon not care about capitalization.

* Fixes startup error.  Demonic summoning now works.  It's very simple, just say their true name.

* Demons now have a tongue.  True demon bodies are deleted upon regression.

* Demons can now be punched.
Demons can no longer resist a fire out, since it does nothing to them.

* true demons show up in player panel.  Hellfire works again.

* Prepares for commit 16940

* Demons are now known as devils.

Still needs testing.

* Oops, didn't commit everything last commit.

* Finishes converting demons to devils.

* Fixes speech for lizards/flymen when they speak a demon's name.

* Update tips.txt

* Changes variable from static to global as per Remie's suggestion.

I disagree with Remie's assessment, as a list that will never change, even between games, seems like it should be static.

* Removes devil summoning.  Hopefully, I'll be able to eventually find a way to implement it satisfactorily, but for now, I'll leave it out.

* Removes carriage returns

* Combined modified icon files

* Fixes #17184

* Imps no longer show up in the end round report.  This is because there can EASILY be 100+ imps if the crew is well armed.

Non-employment filing cabinets no longer take 30 sec to wrench/unwrench.

* The lawyer can actually buy souls back now.  Oops.

* Fixes true/arch devil spritesheet to have correct sprite names.

* Relocates Box's employment cabinet to Law office.

* De-devil-ing someone now removes the devilinfo.
De-devil-ing now returns an error when used on true and arch devils

* Re-factors whiteness code for jumpsuits.

* Merges icons, reverts failed merge of map

* Merges map with CAS decks

* Fixes copying employment contracts

* Derp, fixes compile error.

* Replaces antaghud with customizable vision range for knowledge boon.

* Prevents a runtime if devil is gibbed while ascending.

* Neatens contract code, and removes excess variable from humans.

* Fixes compile errors

* Organizes weakness code slightly.  Adds ability for a species override on weakness.  (Make flypeople take 2x damage from flyswatters for example)

* Removes sixteen erroneous characters from the codebase.

* Removes trailing return

* Makes typeless for loops, removes a runtime, and removes unhelpful comments.
2016-05-08 18:44:27 +01:00
paprika 28a8387b17 initial commit 2016-05-07 14:39:17 -07:00
Dahka 41e9342a2b adds new syringe types and piercing syringe projectile 2016-05-05 21:45:37 -03:00
phil235 68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
kevinz000 5ea0a911d1 Some more fixes 2016-05-03 00:52:23 -07:00
kevinz000 67456fb6a1 Peacekeeper Borgs! 2016-05-02 23:34:06 -07:00
Cheridan 718d80fa84 Merge pull request #17238 from optimumtact/patch-4
Dead code trimming
2016-04-30 05:25:49 -05:00
Cheridan d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
KorPhaeron b6bdc66e30 Merge pull request #17192 from Incoming5643/I_was_feeling_down_so_heres_some_magic
Buffs the staff/wand of door creation
2016-04-29 08:27:49 -05:00
oranges 586ed8eb29 Dead code trimming
Don't mind me gardening away here
2016-04-29 22:07:46 +12:00
phil235 750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
Incoming5643 e9706a798d mineral doors are dumb 2016-04-27 22:15:25 -04:00
Incoming 5a77cefe2d humor me here I can't test locally right now 2016-04-27 22:07:14 -04:00
Incoming 55b830f39d buffs the staff/wand of door creation: Doors created start open, it can also be used on airlocks to open them akin to the knock spell. 2016-04-27 21:44:53 -04:00
phil235 fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235 0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
Shadowlight213 ba3e64ab51 Fixes syringe gun chem reactions 2016-04-21 18:49:22 -07:00
Robustin 44ff69c799 Honk Bullet (#16788)
Adds honk bullet and staff.
2016-04-16 12:39:04 +02:00
duncathan eeb0119acb Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/modules/mob/mob_movement.dm
	code/modules/recycling/conveyor2.dm
2016-03-30 22:55:00 -06:00
duncathan e86cf0f280 praise the good lord, for the game finally compiles 2016-03-29 19:04:37 -06:00
Xhuis b44fa098ac Fixes animated statues being invisible 2016-03-29 19:56:33 -04:00
duncathan 3f1375ba39 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	_maps/RandomZLevels/Cabin.dmm
	_maps/RandomZLevels/beach2.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/templates/lavaland_surface_automated_trade_outpost.dmm
	_maps/templates/lavaland_surface_biodome_winter.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	code/controllers/subsystem/air.dm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/effects/aliens.dm
	code/game/objects/effects/overlays.dm
	code/game/objects/items/apc_frame.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/girders.dm
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/mineral_floor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/simulated/river.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/simulated/walls_reinforced.dm
	code/modules/admin/verbs/buildmode.dm
	code/modules/atmospherics/environmental/LINDA_turf_tile.dm
	code/modules/events/spacevine.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/holodeck/turfs.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/interactive.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/bot/floorbot.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/singularity/narsie.dm
	code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
	code/modules/research/server.dm
2016-03-29 14:46:06 -06:00
duncathan b9950c4358 turf/open and turf/closed 2016-03-29 13:38:56 -06:00
Core0verload fe253ec0b9 Revert "Introduces the new taser. " 2016-03-26 23:01:18 +03:00
CPTANT b9090ffef2 Merged with master.
Solved armor bypass.
2016-03-22 16:07:38 +01:00