cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 13 Branches 2 Tags
dev-docs-readme
Commit Graph
954 Commits
Author SHA1 Message Date
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
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
Markolie 8a3347523c Purge Fahrenheit 2015-09-13 23:07:29 +02:00
Markolie 2cf27f9255 Get rid of two obsolete overrides 2015-09-13 23:03:16 +02:00
Markolie ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
Markolie aaeac981b9 Temperature gun update 2015-09-13 21:05:23 +02:00
Fox-McCloud a019934e9e Pass I 2015-09-04 05:18:48 -04:00
Tigercat2000 7f4ac72910 Progress bars + Wall Rationalization 
This commit does the following:
 - Ports progress bars from -tg- (tgstation/-tg-station#9921)
 - Refactors wall attackby code to make it 100% less insane; Instead of
   manually checking every little thing, it uses do_after,
   consequentially, making the new progress bars affect dealing with walls
   as well.

Wall code makes a tiger sad.
 2015-08-31 13:38:51 -07:00
DZD 0965789925 Fix merge conflicts 2015-08-21 18:38:42 -04:00