cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
254 Commits
Author SHA1 Message Date
variableundefinedandGitHub 1b6022ac93 Merge pull request #10632 from Kyep/trader_tweaks_2 
Sol Trader Updates 2
 2019-01-14 21:35:47 +08:00
Kyep 520d880140 makes 9mm rubber ammo clip say its rubber 2019-01-10 15:20:08 -08:00
Aurorablade 3aa3c942d1 FiXes CaPs 
Makes the claiber type match the ammo type so it loads correctly in cap guns
 2019-01-10 01:21:11 -05:00
variableundefinedandGitHub a1f9a19fe2 Merge pull request #10557 from datlo/clownwiz 
Adds the Staff of Slipping and Clown wizard outfit
 2019-01-09 17:59:08 +08:00
AzuleUtama fb052938c8 Cane shotgun darts more effective + other changes 2019-01-05 01:41:39 +00:00
datlo 5b92bdd66d Add staff of slipping (placeholder sprites) 2018-12-30 16:54:16 +00:00
Granodd 9725c7536b Refactors reloading and adds new gun sounds to ballistics 2018-12-02 03:20:05 -05:00
datlo a80efa4924 Add the advanced mimery kit to mime uplinks 
Also adds :
Mime specific spellbooks
TG wizard forcewall (mime is a subtype, will implement for wiz later
probably)
Fake finger gun spellbook in arcade
 2018-11-23 07:23:34 +00:00
AzuleUtama e2c81535f0 X-ray laser nerf - Falloff and Charge 
See here for the main reasoning behind the PR -
https://nanotrasen.se/forum/topic/14790-wanted-unwanted-features-refactors-bugfixes-thread/
 2018-11-14 21:12:52 +00:00
Citinited b07af660ed Lowers min metal return from autolathe to 500, reverts cost of foam darts to 500, 2018-11-09 23:18:54 +00:00
variableundefined 65c246c1c9 TG container_type refactor 2018-10-13 08:20:52 +08:00
variableundefinedandGitHub c2bf480622 Merge pull request #9631 from Birdtalon/ERT-changes 
Gamma ERT Changes
 2018-10-09 08:58:15 +08:00
Birdtalon deec79982e adds paranormal loadouts, alters ERT survival kit box, updates PDW 9 sprite, adds paranormal armour variants. 2018-09-28 19:22:55 +01:00
Birdtalon 5275b5f56f further gun tweaks/changes, adds sprite 2018-08-31 19:12:39 +01:00
Birdtalon 49e47d00bb adds multi lens immolation gun 2018-08-29 18:57:35 +01:00
shazbot194 939cefcca0 Updates Enforcers 2018-08-22 18:48:01 -08:00
Crazy LemonandGitHub bfb00912af Merge pull request #9113 from shazbot194/Shotguns_mk2 
Shortening Sawn off Shotguns
 2018-08-03 13:43:24 -07:00
Fox McCloud 6c9f83f685 Stechkin Maintenance Pistol Change 2018-06-30 19:24:56 -04:00
shazbot194 6b8da9ca13 Adds in all the stuff from the last one 2018-06-13 20:22:17 -08:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox-McCloud de993b73b3 Nerfs Shotgun Pellets 2017-11-14 00:47:55 -05:00
Fox McCloudandGitHub 84aca8f1b5 Merge pull request #8181 from Anasari/IDiedForSecBorgsSin 
Increase energy cost of cyborg's laser & disabler
 2017-10-11 17:30:38 -04:00
Ansari 51dceab69c Change the e-cost on both gun to 250 2017-10-03 16:39:04 +08:00
Ansari db8ecd2e6e Add two ammo_casing. Increase energy cost to 300. 2017-10-02 18:11:04 +08:00
uraniummeltdown f8cfa51b21 10mm alt magazines have their own sprites 2017-09-30 22:22:11 +04:00
Crazy LemonandGitHub d66434120a Merge pull request #7869 from shazbot194/Enforcer_upgrade 
New enforcer sprites, adds suppressor and flashlight support, and a trainer
 2017-08-31 17:44:15 -07:00
shazbot194 076008e44b Foam magazine name change 
Enforcer Foam magazine
 2017-07-25 14:39:25 -08:00
shazbot194 e2415a74f6 Adds in more colors, suppresors, and a trainer 
read desc for more deteails.
 2017-07-25 14:29:41 -08:00
Fox McCloudandGitHub d29d285aef Merge pull request #7764 from Kyep/shotgun_noreact 
Shotgun darts are no longer noreact like cryobeakers
 2017-07-25 11:48:14 -04:00
Alffd b0e460a203 Fixes tab issues 2017-07-19 20:05:43 -04:00
Kyep af4a14a6c4 Shotgun darts are no longer noreact like cryobeakers 2017-07-12 05:49:43 -07:00
Fox-McCloud 666fff6e4a useless bullet removal 2017-07-01 20:38:58 -04:00
scrubmcnoob 20c4384828 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2017-04-29 19:42:10 -04:00
Crazy LemonandGitHub ff271f7b29 Merge pull request #7061 from Fox-McCloud/damn-cells 
Damn cells
 2017-04-09 13:55:30 -07:00
Fox-McCloud 183702a36e fix up 2.0 2017-04-02 00:38:14 -04:00
Ronald T. Mullins IIIandGitHub 828ad8eea6 Fixes #6993 
The typo is actually "Incindiary" not "Incinidary". :3

Should this be done in a bigger Fixes PR? I just thought that I had free time and saw this sooo...
 2017-03-29 20:26:55 -05:00
Fox McCloudandGitHub cff15468ba Merge pull request #6478 from FlattestGuitar/lasers 
New laser carbine icons
 2017-02-18 11:07:56 -05:00
Mieszko Jędrzejczak e8a04e5524 Laser carbine icons! 2017-02-17 14:21:48 +01:00
Krausus 4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
Markolie 2a23862c6a Kinetic accelerator update, other fixes 2017-02-06 18:39:03 +01:00
Fox-McCloud 390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00
Markolie 2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi
 2017-01-31 17:44:38 +01:00
Fox McCloudandGitHub 0283e75fe5 Merge pull request #6254 from FlattestGuitar/erifle 
Adds a laser carbine!
 2017-01-31 00:43:15 -05:00
Markolie 1d7de41acb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/pooling/pool.dm
 2017-01-27 17:28:14 +01:00
Fox-McCloud 51bbe8c466 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-26 06:53:18 -05:00
Crazy LemonandGitHub 0e42e416b6 Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor 
Makes Reagents Holder Process and Refactors NOREACT
 2017-01-26 03:47:30 -08:00
FlattestGuitar 692f2d238b Adds a laser carbine! 
Admin only for now.
 2017-01-26 12:45:36 +01:00
Fox-McCloud d0b378892d Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 22:25:00 -05:00
Markolie a7205cfd3e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/projectiles.dmi
 2017-01-23 17:36:37 +01:00
Fox-McCloud dc0710135e more fixes 2017-01-23 00:53:44 -05:00