Commit Graph

724 Commits

Author SHA1 Message Date
Fox-McCloud 1ff23cd3ca lesser summon guns, wizman update 2016-01-29 09:12:37 -05:00
Fox-McCloud 31cf368706 Fixes Holstering a Few Guns 2016-01-20 18:39:45 -05:00
TheDZD b1e6f7c0a8 Merge pull request #3157 from DaveTheHeadcrab/blueshitgun
Blueshield: Advanced Stun Revolver
2016-01-16 23:17:54 -05:00
Fox-McCloud db90f5118b Fixes Revolver Spin Runtime 2016-01-13 00:04:09 -05:00
FalseIncarnate 7b581a8150 Revolver Fixes
Fixes the revolver being named "revolver" instead of ".38 Mars Special"
(was an issue even before #2722, but no one besides Fox seemed to
realize that due to the way the code was)

Fixes revolvers not actually getting the Spin verb to spin the chambers
as advertised in #2722
- verb and proc are similar, yet different.
2016-01-11 01:47:18 -05:00
Fox McCloud a2f944cfd9 Merge pull request #2722 from ZomgPonies/russian
Revolver Stuff
2016-01-11 00:18:21 -05:00
Fox-McCloud 576eb179e1 Armory Tweak 2016-01-09 23:29:35 -05:00
TheDZD 82b12d1a34 Merge pull request #3164 from Fox-McCloud/uplink-fixes
Uplink and Syndicate Cyborg Fix
2016-01-08 17:28:40 -05:00
Fox-McCloud a21d1b5221 Uplink and Syndicate Cyborg Fix 2016-01-08 17:07:33 -05:00
Fox McCloud efbe361853 Merge pull request #3149 from DaveTheHeadcrab/friendlyfire
Adds Fun
2016-01-08 15:13:24 -05:00
SamCroswell bffd71cce5 BS Revolver Fluff 2016-01-08 13:42:37 -05:00
Fox McCloud 6f70f7790f Merge pull request #3139 from DaveTheHeadcrab/idedplsnerf
Tweaks .38 Rubber Bullet Damage
2016-01-08 00:44:39 -05:00
SamCroswell 0b69e3dfd7 I submit to overlord Fox! 2016-01-08 00:40:51 -05:00
SamCroswell 134e507ee6 Asset Protection Energy Gun 2016-01-08 00:27:51 -05:00
SamCroswell 96f7f48f32 Properly spells magazine 2016-01-07 15:17:44 -05:00
SamCroswell eb8b2cc09f Adds Fun 2016-01-07 15:08:12 -05:00
SamCroswell 68cfea1e7c Reduces Detective's Revolver Damage 2016-01-06 21:43:09 -05:00
Fox-McCloud ebdd9d3897 Timestop Spell Port and Sepia Slimes 2016-01-06 03:30:08 -05:00
Fox-McCloud 44d46bc456 map fix 2016-01-03 22:42:59 -05:00
Fox-McCloud 97527dddc6 tweak 2016-01-03 20:34:40 -05:00
Fox-McCloud 7830cd215b shotgun 2016-01-03 04:03:48 -05:00
Fox-McCloud eade350dc8 Sec Rifle Port 2016-01-02 01:06:37 -05:00
Fox McCloud 9d8c5ba4fc Merge pull request #3003 from FalseIncarnate/master
Naughty List Revenge
2015-12-24 23:03:35 -05:00
Fox-McCloud 7ef528dcdc Medibeam and Guardian Fixes 2015-12-24 11:28:40 -05:00
FalseIncarnate c032781c7b Naughty List Revenge
Santa has refused to deliver presents to the NSS Cyberiad for an unknown
reason.

Meanwhile, a distress beacon is received from the North Pole, on an
unencrypted Syndicate frequency. Apparently, Christmas Eve was anything
but a silent night.

A rogue operative seems to have infiltrated the North Pole and attempted
to coerce Santa into removing him from the Naughty List, but his plans
may have backfired. Santa has finally snapped, and must be put down in
order for the crew to receive their gifts this year.

The gateway has been reconfigured to lock onto the general location of
the distress signal, and will not lock on to any other destinations
until after Christmas has passed. Be warned, however, that the frozen
north is far from hospitable, and a variety of dangers await you beyond
the safety of the blast doors.

This mission will offer some new challenges, and is designed to be
undertaken by a squad of players. Will your team be able to put Father
Christmas to rest and rescue the presents, or will you meet your demise
in the freezing tundra?
2015-12-24 03:40:31 -05:00
Fox-McCloud 09dab6bdea EMP Fixes 2015-12-23 04:09:47 -05:00
ZomgPonies dcda320847 Final revolver fixes 2015-12-20 06:46:11 -05:00
ZomgPonies 3acff9ccff Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into russian 2015-12-20 06:29:28 -05:00
Fox-McCloud 8bfa404d9d auto-switching 2015-12-19 21:55:41 -05:00
Fox-McCloud ea11eaa387 Ports Wormhole Projector 2015-12-19 00:57:40 -05:00
Fox-McCloud fe3d1b7360 balance 2015-12-17 18:24:03 -05:00
Fox-McCloud a9a0a49986 Ports TG Beam Code and Medigun 2015-12-16 21:05:10 -05:00
Fox-McCloud 068bfd10ba TG Mining Update 2015-12-10 21:35:02 -05:00
Fox McCloud a86d6121f8 Merge pull request #2753 from orelbon/Laser-Gun
Changes Laser gun energy consumption
2015-12-08 22:00:01 -05:00
orelbon c931c9f6be Changes Laser gun energy consumption 2015-12-06 12:51:34 -05:00
ZomgPonies 62f4f5cf66 Revolver stuff 2015-12-03 23:18:03 -05:00
Tastyfish 85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
ZomgPonies 937cb63dfa Cyborg Egun no longer EMP immune 2015-11-21 22:06:09 -05:00
ZomgPonies e244fdb88d Gave combat borgs zipties and replaced laser with egun 2015-11-20 11:02:14 -05:00
Tigercat2000 9186d94ba1 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	icons/mob/suit.dmi
2015-11-11 16:51:44 -08:00
TheDZD b72280c2e2 Merge pull request #2512 from Fox-McCloud/pneumatic-cannon
Ports TG Pneumatic Cannon
2015-11-11 09:52:16 -05:00
Fox-McCloud bfac0b62fa Ports TG Pneumatic Cannon 2015-11-09 22:54:05 -05:00
Fox-McCloud 43930aba4a Decloner Tweak 2015-11-08 21:45:34 -05:00
Tigercat2000 633a9e68b4 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	 ^ This shit is haunted. It's conflicted on two branches for 0
	 reason, the automatic merge wouldn't work on the fucking end of
	 file.
2015-10-19 16:13:51 -07:00
tigercat2000 8d69ff7d9c >FUCKING BAYCODE 2015-10-13 19:58:17 -07:00
TheDZD 07770fdda7 Merge pull request #2321 from Fox-McCloud/another-del-pass
Another del->qdel pass
2015-10-09 18:05:00 -04:00
Fox-McCloud e17c6bde22 Another del->qdel pass 2015-10-08 16:49:10 -04:00
Tigercat2000 1de3c2e075 Rigsuit Fixes: Chargecost divided by ten, for reasons I can't fucking understand 2015-10-08 11:41:49 -07:00
Fox-McCloud 5c512793b9 Removes the Rest of Pooled Objects 2015-10-08 14:18:40 -04:00
Tigercat2000 545c38a79b Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/game/objects/items.dm
2015-10-08 11:16:30 -07:00