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
Mark van Alphen
4ba4434a8e
Merge pull request #2309 from Fox-McCloud/ammo-update-fixes
...
Ammo update fixes
2015-10-08 19:27:52 +02:00
Fox-McCloud
58253b23ce
ammo tweak
2015-10-07 14:51:14 -04:00
Fox-McCloud
efcbf98c8d
how did this not commit
2015-10-06 17:19:07 -04:00
Fox-McCloud
623696b985
Ammo Update and Fixes
2015-10-06 17:18:39 -04: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
Tigercat2000
8c97846746
-tg- style inventory update, stripping update
...
This commit does the following:
- Updates a few of our inventory procs to -tg-'s latest
- Nukes the equip_e system from orbit
- Fancy UI for stripping people now
- Nuked fucking kitten ears from their snowflakey bullshit update_icons
shitty fuck fuck FUCK
- NUKED FUCKING METAL DETECTORS AHHHHHHHHHHHHHHHHHHHHHHHHHH
2015-10-04 16:53:48 -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
Tigercat2000
4b6a3ddcb6
-tg- SpaceMove update
...
This commit updates the spacemove system to -tg-'s; All objects now drift
in space, not just mobs. A few hardcoded space checks have been replaced
with has_gravity(); So it applies to zero-G as well as space.
Spacepods no longer drift, because their snowflakey shitcode just doesn't
work. So they just move.
2015-09-25 15:53:59 -07:00
Fox-McCloud
cf5bfcaac1
Telegun Refactor
2015-09-23 00:44:50 -04:00
Markolie
ea305d3ffa
Saber SMG update, add armour piercing variable
2015-09-21 22:50:07 +02: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
Markolie
be5653a25f
Get rid of item_override
2015-09-15 04:20:46 +02:00
Markolie
90f722d752
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
icons/mob/back.dmi
2015-09-15 04:18:27 +02:00
Tigercat2000
0603f73232
Bay12 examine overhaul.
...
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
2015-09-14 11:51:40 -07:00
Markolie
2b74789b37
Burst fire tweaks
2015-09-14 04:39:39 +02:00
Markolie
591f2747ca
Further gun updates
2015-09-14 04:36:41 +02:00
Markolie
f41f0a59fe
Guns update
2015-09-14 04:05:20 +02:00
