cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-19 10:06:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,512 Commits 17 Branches 2 Tags
732c3b4ae5fa94de9a3cd900fed520a73d1273d2
Commit Graph
193 Commits
Author SHA1 Message Date
Tastyfish 4f3ce4ecbc Adds picture frames 2016-02-21 21:00:45 -05: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
FalseIncarnate 0015eac2c8 Arcade Prize Counter 2016-02-14 01:58:36 -05:00
Aurorablade 25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
Aurorablade b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
Fox-McCloud 20cb463add Removes External Shield Generators 2016-01-25 04:14:40 -05:00
Aurorablade 42d8ac68b5 xeno organ fail still... 2016-01-22 22:01:24 -05:00
Fox-McCloud f5220f7ce3 Assault Surplus Create and Knife Refactor 2016-01-22 10:04:24 -05:00
Aurorablade 51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
TheDZD ebdbe4627b Merge pull request #3114 from Fox-McCloud/chem-master 
Constructable Chem Master
 2016-01-05 19:36:11 -05:00
Fox-McCloud 51851e9ec5 Constructible Chem Master 2016-01-04 18:23:41 -05:00
Fox-McCloud 38149bfc7d Merge remote-tracking branch 'upstream/master' into sec-rifle 2016-01-03 22:35:28 -05:00
Fox-McCloud a3a03a67f9 derp 2016-01-03 21:38:43 -05:00
Fox-McCloud 880efed300 Fixes Shield Generator Circuits 2016-01-03 21:36:27 -05:00
Fox-McCloud eade350dc8 Sec Rifle Port 2016-01-02 01:06:37 -05:00
Aurorablade b58ed5a9d4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2015-12-26 22:18:09 -05:00
Fox-McCloud 5069d949bd Ports TG's Tesla Engine 2015-12-24 00:40:20 -05:00
Aurorablade 1a70e9caf5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2015-12-24 00:17:26 -05:00
Fox-McCloud 2481a8d7bd Research Lockbox Access Change and Wormhole Projector Lockboxing 2015-12-22 11:42:09 -05:00
Aurorablade 80eb828563 this shit dosen't even compile yet... 2015-12-19 22:39:47 -05:00
Fox-McCloud ea11eaa387 Ports Wormhole Projector 2015-12-19 00:57:40 -05:00
Aurorablade 424837ecad Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-12 19:06:04 -05:00
Fox-McCloud 068bfd10ba TG Mining Update 2015-12-10 21:35:02 -05:00
Aurorablade b88ddf0257 Diagnostic hud, file i miseed to make 
and stuff updates right health wise.
 2015-12-10 20:05:54 -05:00
FalseIncarnate 6dfbd8f260 Claw Games! 
Adds claw games, the absolute most-infuriating arcade game known to
mankind.
- Uses new fancy HTML5 / Javascript code stuff
- Is buildable!
- Science can produce the board with programming 2
- Requires a matter bin, manipulator, some cables, and a sheet of glass
- Costs money!
- Accepts cash or ID swipes, 15 credits per play token
- Dispenses prizeballs!
- Open them for a random plushie, carp plushie, or action figure!
- Two sets of sprites, thanks to FoS and Stephanov

Notes for the coders / future:
This provides a basic example for introducing new HTML5 / Javascript
arcade games, as well as a base type machine to use for such games.
While this may seem silly, this proves that we are not doom to have to
tolerate only the battle game and Orion Trail forever, and can even make
our own games for the arcade.
 2015-12-09 00:37:30 -05:00
Fox-McCloud 52d277a400 Minor Research Tweaks 2015-11-23 17:29:15 -05:00
Fox-McCloud 66febf4457 Laser Scalpel Price Tweaks 2015-11-15 19:28:52 -05:00
Robertha89 663f8b87e3 fixes 2458 2015-11-03 22:35:00 +01:00
Crazylemon 3c3f51401b Cuts out all the old weapon/module code 
Also lets drones collect intercom electronics, and gives the autolathe
an APC electronics recipe
 2015-10-13 21:13:49 -07:00
Robertha89 836ddb15d4 Science analyser goggles 2015-10-09 08:22:45 +02:00
Fox-McCloud 623696b985 Ammo Update and Fixes 2015-10-06 17:18:39 -04:00
Mark van Alphen 48a3d1ab9a Merge pull request #2176 from Fox-McCloud/janicarts-and-janitors 
Janicart and Janitor Update
 2015-09-28 03:02:04 +02:00
Fox-McCloud 569758f4cb bluespace trashbag 2015-09-27 06:46:50 -04:00
Fox-McCloud 4413911688 Janicart and Janitor Update 2015-09-26 06:17:29 -04:00
Fox-McCloud d5a6959c27 Gas Turbine 2015-09-25 05:23:05 -04:00
Markolie ea305d3ffa Saber SMG update, add armour piercing variable 2015-09-21 22:50:07 +02:00
Mark van Alphen 739e820faa Merge pull request #2078 from Fox-McCloud/experimentor 
EXPERI-Mentor Addition--Telesci Removal
 2015-09-18 07:18:55 +02:00
Fox-McCloud a35a8cef1b Protolathe Fix 2015-09-17 03:43:36 -04:00
Fox-McCloud d41b09c0a6 Experimentor Addition--Telesci Removal 2015-09-17 00:59:38 -04:00
Markolie 0db98340f8 Further welding tool updates 2015-09-16 01:37:07 +02:00
Mark van Alphen cbb2a16409 Merge pull request #2046 from Fox-McCloud/tech-shell-balance 
Tech Shells: Silver Removal
 2015-09-15 17:36:57 +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
Fox-McCloud 6fd7350746 Merge pull request #2040 from Markolie/guns 
Guns update
 2015-09-14 22:11:33 -04:00
Fox-McCloud 8faf18484c Tech Shells: Silver Removal 2015-09-14 06:40:35 -04:00
Markolie f41f0a59fe Guns update 2015-09-14 04:05:20 +02:00
Markolie aaeac981b9 Temperature gun update 2015-09-13 21:05:23 +02:00
Fox-McCloud 25c35343dc materials-consitency 2015-09-12 16:22:39 -04:00
Fox-McCloud 28bcd7e78b R&D Update and Fix & Cargo Tweaks 2015-09-07 20:03:06 -04:00
TheDZD 0fdfae99ba Merge pull request #1966 from Fox-McCloud/health-assembly 
Health Assembly
 2015-09-07 17:24:52 -04:00