Commit Graph

1227 Commits

Author SHA1 Message Date
Thunder12345 f60cfcf7a6 Fixes combat shotguns
Thank you Kor for unannounced and half assed nerfs by changing the magazine of the combat shotgun without updating the description or mentioning it anywhere
2016-05-18 14:30:42 +01:00
phil235 dd2c91ca64 two tiny fixes (#17658) 2016-05-16 10:03:57 -05:00
phil235 a1a9a6585b Fixes projectile destruction breaking energy guns. 2016-05-14 16:31:17 +02:00
Iamgoofball 65fb5163bd Removes revolver speed loading delay (#17595)
Desucake said to do this.
2016-05-13 12:57:27 -05: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
TechnoAlchemist 4705efa6da Adds new items to the mining vendors. (#17362)
* Adds new items to the mining vendors, also adds tracking implanter since that didn't exist before.

* woops

* Fixes tracking implants for miners, makes medipens not OD you on tricord.

* Actually doesn't OD on tricord now

* Chemical changes.

* Upgraded the jaunter into the wormhole lifebelt

🆑 coiax
rscadd: The Free Golems have developed the jaunter into the  wormhole
lifebelt, which automatically teleports the user when they fall in a
chasm or suffer a major medical emergency. Must be worn on the belt to work.
/🆑

Please don't mistake a random teleportation in crit for saving a user's
life, the Supply channel gets a notification, but suit sensors are
required to find them, and there's no guarantee the location picked is
safe (for example, the Toxins Test Site is a valid jaunt destination,
along with in the middle of the slime cages in Xenobiology).

* Adds modification kit.

* Golem ship now has its own /area

And a bluespace beacon.

* 5 tick medijaunt, no radio, golem jaunters + areas

The number of ticks before a medical emergency jaunt happens is now
five. No radio message is produced.

Free Golems now have no restrictions on what they can purchase. Wormhole
jaunters now specifically drop golems near their ship.

* Modkits remove the race restrictions from KAs.

* Buffs buffs buffs

I'd say something, but I'm sure I'd regret it later.

* Advanced lifebelts, golem superiority

* Removes modkit from minervendors, adds modkit to RnD!

* COMPILE DAMN YOU!!

* I made it compile

* Honor to my country, not to you :(

* fuck

* h-haha?

* Kor you know I would never actually ban you

* i could personally care less for HBls adminning style
2016-05-11 22:19:47 -05: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
Shadowlight213 320bb39eba Removes abductor ability to use guns. (#17515)
* Removes abductor ability to use guns.
Removes agent starting out with an alien blaster

* removes comment

* Makes Abductors able to use alien pistol

Alien pistol now has ALLOW_ALL trigger guard to overcome abductor's
natural NOGUN.

Pistol now starts in the backpack, and the wondertool on the belt.

In addition:
 - Replace multiple copies of IsAbductor() with a single isabductor()
   proc in code/__HELPERS/mobs.dm
 - Adds icon for alien firing pin
 - Adds abductor span for ayylien communication
2016-05-11 20:28:52 +01:00
Nerd Lord da10d5c143 Adds healy glows to cult pylons and the medbeam gun 2016-05-09 19:37:15 -04:00
Jordie a406abfaa7 new sprites for tesla gun (#17509) 2016-05-09 11:40:32 -05:00
Razharas 0a3ddc886c Turns tablecrafting into personal crafting (#17341)
* Converts tablecrafting to datums

* Adds crafting.dm

Adds crafting.dm

* Fix merge conflicts

Fix merge conflicts

* Fixes dme

* Fixes returns

Fixes returns

* Only check hands and remove old paths

Only check hands and remove old paths

* Recipe fixes

Recipe fixes

* Removed action button

Removed action button
Added small ui button to inventory near the intent wheel
Removed debug
href_list is not longer /list

* Added adjucent checks

Added adjucent checks

* Snacks now get chems from parts

Snacks now get chems from parts

* Complex food fuckery fixed

Complex food fuckery fixed

* Fixes old recipe

Fixes old recipe

* Fix to infinite loops in reagent extraction

Fix to infinite loops in reagent extraction
It was finding old empty containers and tries to extract from them

* Fixes hands not checking

Fixes hands not checking

* Fixes reagents fucking up

Fixes reagents fucking up

* Even more reagent fuck ups fixed and comments

Even more reagent fuck ups fixed and comments

* Fixes all the shit i could find

Fixes all the shit i could find

* Removes debug and mechs

Removes debug and mechs

* Argument renaming

Argument renaming

* Fixes all argument names

Fixes all argument names

* Final fix of arguments

Final fix of arguments
2016-05-09 18:14:48 +02:00
Cheridan 11af3176b9 Merge pull request #17472 from Core0verload/mini-egun
Adds miniature energy gun
2016-05-09 01:05:41 -05:00
PKPenguin321 42e1497022 Adds an alt-click prompt to the descriptions of various objects (#17050)
* adds an alt-click prompt to the description of the detective revolver and the washing machine

* adds italicnotice style to stylesheet.dm

* updates revolver desc to be dynamic with vars, use new style

* actually makes it dynamic

forgot to check for reskinned var

* makes washing machine break a line, use new style

* gives lockers an alt click prompt

* fixes indentation, travis

* moves revolver examine changes to gun.dm

* removes redundant locker message

* makes messages just use the 'notice' span
2016-05-08 19:34:26 -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
KorPhaeron b545bee480 Dual magazine shotgun (#17118)
* Dual feed shotgun

* Dual Shotgun Sprites
2016-05-08 13:44:33 +02:00
c0 9af58d7469 Adds miniature energy gun 2016-05-08 06:46:42 +03:00
phil235 524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
2016-05-05 21:57:10 +02: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
Cheridan 51466932c1 Merge pull request #17275 from Fox-McCloud/energy
Makes Shock Revolver Use Energy Projectiles
2016-05-04 15:16:39 -05:00
Jordie 265938e7d9 Merge pull request #17220 from Incoming5643/badmins_doing_shit
View vars will now tell you if something has been previously var edited
2016-05-01 17:02:02 +10:00
Cheridan 718d80fa84 Merge pull request #17238 from optimumtact/patch-4
Dead code trimming
2016-04-30 05:25:49 -05:00
Fox-McCloud e2790c7165 Makes Shock Revolver Use Energy Projectiles 2016-04-30 03:48:54 -04:00
Cheridan d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
phil235 7900f80544 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge
Conflicts:
	code/game/objects/structures/aliens.dm
2016-04-29 20:58:02 +02: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
Incoming 10b966b97c View vars will now tell you if something's been previously var edited 2016-04-28 19:38:21 -04:00
phil235 750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
phil235 be57a223b5 Moves alien structure into the proper folder objs/structures/aliens.dm
Removes incorrect comment about forcedodge projectile.
2016-04-28 22:44:26 +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
Cheridan e6509ddd23 Merge pull request #17115 from KorPhaeron/gun_fix
[S] Fixes minigun bugs
2016-04-27 02:52:22 -05:00
phil235 6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
KorPhaeron e8cc449e41 Fixes gun duping 2016-04-25 13:39:38 -05:00
KorPhaeron f44688ed87 Minigun Fixes 2016-04-25 13:30:16 -05: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
KorPhaeron d93d6160cd Gatling Buff 2016-04-23 19:54:30 -05:00
KorPhaeron 18ce641950 Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA 2016-04-23 15:14:09 -05:00
KorPhaeron ad4782ac41 Tesla Revolver 2016-04-23 13:55:03 -05:00
KorPhaeron c771988284 Gatling Autoclick 2016-04-23 13:47:05 -05:00
KorPhaeron 6ec28fc001 Runtime and MC crash fixes 2016-04-22 11:17:42 -05:00
KorPhaeron a39e3f3f1f Ausops Sprites 2016-04-22 02:16:26 -05:00
KorPhaeron 5009d5eb5d Faster firing 2016-04-21 23:32:56 -05:00
KorPhaeron 84e0fe2b79 Hell lets do 10 damage its an endgame weapon that takes all your inventory 2016-04-21 21:37:58 -05:00
KorPhaeron a78ce8712e Gatling Gun icon fixes 2016-04-21 20:59:07 -05:00
Shadowlight213 ba3e64ab51 Fixes syringe gun chem reactions 2016-04-21 18:49:22 -07:00
KorPhaeron b646b12480 Bit weaker gatling gun 2016-04-21 20:26:58 -05:00
KorPhaeron 5a813a96a5 Gatling Laser 2016-04-21 20:26:13 -05:00