cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 00:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,196 Commits 26 Branches 2 Tags
1663fd359fe67f5ebeee8d9c6f9c84121a93653c
Commit Graph

367 Commits

Author SHA1 Message Date
Regen
097914386f Adds item state 
Also removed extra whitespace
 2016-02-21 23:02:56 +01:00
Regen
f4ba151d33 oops 
it's plasmatech, not plasma
 2016-02-21 14:22:25 +01:00
Regen
8a6bedd028 Fixes 
Fixes typo in the gun sprite, adds origin_tech and tweaks charge cost
 2016-02-21 14:19:18 +01:00
Regen
2db5fec54a Adds immolator laser gun 
Adds an immolator laser gun, which has 7 shots and ignites the target.
http://puu.sh/nfys1/b381d812de.png

Will add more and better pictures tomorrow, but right now I need sleeps
 2016-02-21 03:26:44 +01:00
Fox-McCloud
f47131fbb2 Refactors Bot Weapon Identification 2016-02-12 14:52:50 -05:00
Fox-McCloud
0561987ed8 Kinetic Accelerators Auto-Reload 2016-02-09 02:21:19 -05:00
VampyrBytes
18d7335f4e Fixes #3497 
Deathsquad pulse rifle now fires correct round type
 2016-02-04 17:45:00 +00:00
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
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
SamCroswell
bffd71cce5 BS Revolver Fluff 2016-01-08 13:42:37 -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
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
09dab6bdea EMP Fixes 2015-12-23 04:09:47 -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
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
Fox-McCloud
bfac0b62fa Ports TG Pneumatic Cannon 2015-11-09 22:54:05 -05:00
tigercat2000
8d69ff7d9c >FUCKING BAYCODE 2015-10-13 19:58:17 -07:00
Tigercat2000
1de3c2e075 Rigsuit Fixes: Chargecost divided by ten, for reasons I can't fucking understand 2015-10-08 11:41:49 -07:00
Tigercat2000
4fc91429e5 Baystation Rigsuits 
This commit adds baystation's rigsuit system on top of our own hardsuits;
Our own hardsuits still function fine and are around, but these are
available to admins. Next commit will contain balancing and player
implementation stuff.
 2015-10-05 16:42:00 -07:00
TheDZD
de8e5ecfd0 Merge pull request #2254 from Markolie/swordnborg 
Syndicate borg update, add medical syndicate borg, energy sword refactor
 2015-10-02 15:49:57 -04:00
Fox McCloud
5fe12d313a Merge pull request #2260 from Markolie/fixesfixesfixesfixesfixesfixes 
Fixes
 2015-10-01 19:43:05 -04:00
Markolie
f052512578 Fixes 2015-10-02 01:34:37 +02:00
Markolie
6bae20b0a0 Syringe gun update, borghydro update 2015-10-01 19:30:42 +02:00
Markolie
6f0a8174ad Guns rename, take two 2015-09-30 15:51:14 +02:00
Fox-McCloud
be672419ca Fixes a few Destroys 2015-09-28 18:15:39 -04:00
Fox-McCloud
cf5bfcaac1 Telegun Refactor 2015-09-23 00:44:50 -04:00
Markolie
62235dc859 Wand and Thompson in-hands 2015-09-16 23:12:49 +02:00
Markolie
611cb16df8 Add torch, more in-hand fixes 2015-09-16 03:22:01 +02:00
Tigercat2000
c562680098 Merge remote-tracking branch 'origin/master' into bay_examine 
# Conflicts:
#	code/game/objects/structures/displaycase.dm
 2015-09-15 14:08:36 -07:00
Markolie
bbfc8f5c5b Remove another obsolete icon_override 2015-09-15 04:27:09 +02:00