cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-21 15:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,079 Commits 26 Branches 2 Tags
82b863cefdabb64cb15e03dd7978006390c0f3be
Commit Graph

239 Commits

Author SHA1 Message Date
shazbot194
939cefcca0 Updates Enforcers 2018-08-22 18:48:01 -08:00
Crazy Lemon
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 McCloud
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 Lemon
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 McCloud
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 Lemon
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 III
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 McCloud
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 McCloud
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 Lemon
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
Alffd
3fbc81cea7 Ports Enforcer handgun, rubber bullets, and new ammoboxes. 2017-01-15 21:13:22 -05:00
Fox-McCloud
ea8080e6c9 Makes Reagents Holder Process and Refactors NOREACT 2017-01-14 20:09:49 -05:00
Markolie
5ace926e42 Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking. 2016-10-25 00:50:31 +02:00
shazbot194
b6fef2185c Changed the way smg & toy icon updates. 
Switched from using math to fit the icon's name to having the icon's
name fit the math, also changed the normal SMG's mag so it can also
updates properly.
 2016-09-25 01:45:38 -08:00
shazbot194
47912cfd43 Small fixes for foam force weapons 
-Adds a new icon for the toy tommy gun with a blue muzzle, so it doesn't
have to use the real tommy gun's icon or what is was using, nothing.
-fixes the rounding on the toy smg so it now doesn't have an invisable
magazine when loaded and displays the correct amount of ammo.
 2016-09-14 20:11:38 -08:00
shazbot194
da6a80c2f4 Fixed the Riot foam icon (#5676) 
* Fixed the Riot foam icon

Adds the varable riot to both normal foam darts and adds some else if
statments to give both darts and modified darts the correct icon.

* Update ammo_casings.dm

* Update ammo_casings.dm

* Update ammo_casings.dm

* Fix for single shot stechkin

changes how the stechin updates it's magazine so the single shot
magazine doesn't go invisable.

* Revert "Fix for single shot stechkin"

This reverts commit 11974996c4.

* changed description

changes the discription and moves it one line down.
 2016-09-14 20:42:37 -04:00
Isaac Erwin
8986dca9d8 Now the 45 mag can use all 9 sprites 2016-09-14 14:42:18 -04:00
Isaac Erwin
3a1d07454f Okay, foxxy 2016-09-13 19:27:15 -04:00
theColdflame
4373165e21 Adds additional variants of 10mm ammunition. (#5596) 
* adds variants of 10mm ammunition

you can shoot people with it

* ones which work

* third time's the charm

* adds the letter 'u'

* makes armor pen values more reasonable

* rebalanced AP
 2016-09-04 09:38:39 -04:00
Chakirski
1f703104e4 Less stealth more sprite. 2016-08-03 22:54:00 -05:00
TheDZD
4a818f865c Merge pull request #5159 from Fox-McCloud/bola 
Adds in Bola, Other Recipe Tweaks
 2016-07-24 23:37:24 -04:00
TheDZD
79d51a57da Refactors telegun, mimicgun, and tempgun 2016-07-22 16:08:17 -04:00
Fox-McCloud
fe8ef6ca69 Adds in Bola, Other Recipe Tweaks 2016-07-22 13:20:09 -04:00
Fox-McCloud
5fdad7355b more OOP 2016-07-21 06:33:39 -04:00
Mieszko Jędrzejczak
4751e0988c Fixes pulse shot cost. 2016-07-11 19:52:24 +02:00