Commit Graph

349 Commits

Author SHA1 Message Date
phil235 081bae6740 Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
Ikarrus 71d529a6a5 More adjustments
- added unrestricted-use guns
- excluded fake toy guns
- Unexcluded throwing stars
2015-04-11 14:37:21 -06:00
phil235 7df5998740 Nerfing plasma cutters, their damage and range is reduced in pressurised environment. Reduces drilling cost of all drills to make them appealing. Drill cells are now removed by clicking the drill, no more screwdriver needed. Resonator fields can no longer be stacked on each other. Switching from 5 to 3 seconds detonation on the resonator is now done by clicking it instead of screwdriving. Increasing building costs for plasma cutters. Removes mineral/screwdriver upgrades to resonator and kinetic accelerator. Plasma cutters can now only uses solid plasma. 2015-04-08 03:44:56 +02:00
phil235 d0e9a5c0c9 Nerfs the kinetic accelerator.
Remove the plasma upgrade chance of rigging the cell since it doesn't work as intended and can break the KA without any feedback.
2015-04-06 22:43:03 +02:00
kingofkosmos 2e4a8fcce8 Recieve --> receive grammarfix
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
ACCount12 1c219f0ebe A lot of stuff 2015-03-31 18:30:09 +12:00
pudl 0964979a90 bitch says she wanna keep her throat warm 2015-03-26 21:16:25 -05:00
pudl 69924a15be plasma/ripley update 2015-03-25 18:06:26 -05:00
Fayrik 117d9d11cd Riot darts are now available to Nuke ops and Traitors. And I am SO done with this. 2015-03-22 22:11:56 +00:00
Fayrik 0173c7af6e Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.) 2015-03-21 16:18:32 +00:00
Fayrik d3d491588e Cleaned up the functionality and prepared things for PR. 2015-03-20 23:19:19 +00:00
Fayrik a030c9889e Glorious second commit, introducing (mildly) dangerous rounds and a new suicide check. 2015-03-20 23:03:06 +00:00
Fayrik b758992e8c First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo. 2015-03-20 23:02:53 +00:00
Jordie0608 f0731d01e2 changelog compiled 2015-03-17 20:03:31 +11:00
phil235 921ed1330e Fixes russian revolver's special mechanism message appearing when placing it on a table or in your inventory.
Fixes its description about auto spinning barrel.
Fixes its behavior when used as a melee weapon.
2015-03-12 14:34:23 +01:00
phil235 cb96e65f1b Merge pull request #8254 from Steelpoint/HoSGunSpelling
[BALANCE]Buffs the Head of Security's Firearm.
2015-03-10 22:09:46 +01:00
Steelpoint a5ba5972b4 AdditionalSpelling 2015-03-10 17:26:05 +08:00
Steelpoint 79857b0eac InitalCommit 2015-03-09 17:02:34 +08:00
Cheridan 7ec6ad84cd Merge branch 'renamingandreskinning' of git://github.com/paprka/-tg-station into paprka-renamingandreskinning
Conflicts:
	icons/mob/back.dmi
2015-03-08 23:15:22 -05:00
phil235 809a1be279 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
Conflicts:
	icons/mob/head.dmi
2015-02-25 18:50:42 +01:00
paprka 9e450b30df further improvements and changelog 2015-02-25 00:25:27 -08:00
paprka 7a8e78a4c3 this kills the object verbs 2015-02-25 00:19:53 -08:00
Steelpoint 9ce2add084 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
Conflicts:
	icons/obj/guns/energy.dmi
2015-02-25 14:10:54 +08:00
paprka 1d552123dc hos gun revert 2015-02-24 21:54:48 -08:00
paprka 393123b50b Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs
Conflicts:
	code/modules/projectiles/gun.dm
	icons/obj/guns/energy.dmi
2015-02-24 20:03:33 -08:00
Steelpoint da53175ad5 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
2015-02-25 11:44:27 +08:00
Remie Richards b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
Delimusca b30aaf3b47 fixed turret slotflag, inheritance vars 2015-02-23 14:55:26 -07:00
phil235 3e100729bc Fixes mimana sprites. Small fix to snap corn picking. Fixes russian revolver not killing you. 2015-02-22 23:02:07 +01:00
paprka 55dcc82f45 fixes leftover delay line 2015-02-20 01:58:32 -08:00
Steelpoint 1221f012c6 Breach to Disable 2015-02-20 11:41:56 +08:00
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
Delimusca dbc6b91921 Merge branch 'updaterclean' into zipzaps
Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
2015-02-18 22:03:03 -07:00
Delimusca 4f6c74d291 replaces turret egun with ecannon 2015-02-18 21:24:07 -07:00
paprka 074a139576 Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs
Conflicts:
	icons/obj/guns/energy.dmi
2015-02-18 02:29:07 -08:00
Steelpoint 8b53405b17 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
2015-02-18 12:50:05 +08:00
phil235 dcf99380b6 Merge pull request #7653 from GunHog/IonCarbinesFor-k-ommandos
Introducing the Ion Carbine!
2015-02-18 00:16:33 +01:00
GunHog 9d7b7a34ae Fixes my merge error. 2015-02-17 14:47:26 -06:00
paprka 71758715fa some typo fixes 2015-02-15 13:33:15 -08:00
paprka 8b12b14f59 hospistol and disabler stun revolver 2015-02-15 13:31:31 -08:00
Cheridan 15439b8c4e Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix
Conflicts:
	code/game/gamemodes/wizard/artefact.dm
2015-02-15 10:27:50 -06:00
Cheridan 47a631b1c7 Merge pull request #7713 from paprka/wotdefuk
fixes improvised shotgun back slot invisible shit
2015-02-14 16:01:39 -06:00
phil235 135293bedf Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
Swag McYolosteinen b2d6ce5481 Merge pull request #7668 from dannno/suicidefix
Fixes #7647
2015-02-14 12:12:38 +01:00
Cheridan 14c9abaaee Merge pull request #7539 from Iamgoofball/kinetic
Ports the kinetic accelerator changes from NT
2015-02-13 17:56:03 -06:00
paprka cff73d83c6 fixes improvised shotgun back slot invisible shit 2015-02-13 14:04:23 -08:00
paprka 54040d9867 stun changes and stun revolver 2015-02-13 09:26:31 -08:00
dannno db0fd07f0f fixes blowing your brains out without a gun 2015-02-12 15:05:45 -05:00
Steelpoint 940601bcfa Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
Conflicts:
	icons/obj/guns/energy.dmi
2015-02-13 01:14:52 +08:00
GunHog 0b0737b292 Merge remote-tracking branch 'remotes/origin/master' into IonCarbinesFor-k-ommandos
Conflicts:
	icons/mob/belt.dmi
	icons/obj/guns/energy.dmi
2015-02-12 09:08:31 -06:00