Tigercat2000
78f53553f8
Reduce lines by removing blank lines added by PJ's script
2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3
Replace most (if not all) output << operators with to_chat(user, message)
...
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.
Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Fox-McCloud
3ac2f23377
Heavily Rebalances Science
2016-03-09 02:58:05 -05:00
Aurorablade
9a804ebd31
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-24 06:27:16 -05:00
Aurorablade
d861d86edd
halp
...
open handed cavity item removal not working, help_shake_act seems to be
taking priotity, debrained sprite not appearing right on brain removal
2016-02-21 23:55:47 -05:00
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
Aurorablade
570dd619b7
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-18 19:01:41 -05:00
Aurorablade
29293dde10
look ma no brain
2016-02-17 22:03:02 -05:00
Fox-McCloud
f47131fbb2
Refactors Bot Weapon Identification
2016-02-12 14:52:50 -05:00
Aurorablade
545d3abf19
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-11 18:03:09 -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
Aurorablade
0fc841f0f9
can i sleep uyet
2016-02-03 00:40:10 -05:00
Aurorablade
6001f3d80c
ayyy merge conflicts fix
2016-02-02 20:46:38 -05:00
Aurorablade
25876fd036
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-02 15:35:54 -05:00
Fox-McCloud
1ff23cd3ca
lesser summon guns, wizman update
2016-01-29 09:12:37 -05:00
Aurorablade
53f410272a
home streach.
2016-01-26 20:53:13 -05:00
Aurorablade
42d8ac68b5
xeno organ fail still...
2016-01-22 22:01:24 -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
