cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-18 01:26:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,125 Commits 17 Branches 2 Tags
ea004bddcf2e6059587d0b8a95df19087d1c7a77
Commit Graph
178 Commits
Author SHA1 Message Date
Qwertytoforty 225af04d54 Last fix attempt before getting more help 2020-10-05 15:42:28 -04:00
farie82andGitHub 81682dc626 Adds muzzle flashes for guns depending on the ammo (#13322) 
* Muzzle flashes added for guns

* Use an muzzle flash effect now.

* Unused var

* sillenced guns have a lower alpha muzzleflash effect
 2020-09-20 12:41:45 -04:00
Kyep 4ddb9818f3 fixes merge conflict 2020-09-15 08:59:18 -07:00
variableundefinedandGitHub 3a3ff1400a Merge pull request #13447 from EMPlight/BulldogXLmag 
Adds Bulldog extended drum mags and bundle for nuke ops.
 2020-09-14 16:45:04 -04:00
Kyep 5e68b702b5 Fix ammo box sprites 2020-09-04 19:55:21 -07:00
TDSSS ada7ddb605 shotguns come preloaded with buckshot now 2020-08-27 14:49:52 +02:00
KyepGitHubKyep
 		547d76fb4b Cyborg Improvements (#13056) 
* ash storm immunity

* safety override & lavaproof upgrades

* mini-extinguisher for janiborg

* borg cell paths, prevent station borgs using gamma module

* Limit crew SecBorgs to 2, DS borg laser reflection

* replaces standard module with generalist module

* generalist borg gets crowbar

* fix bug where ert engi/med borgs runtime / do not get sprites

* adds TG lavaland and spidermin mining cyborg icons

* roundstart borgs=2, spawn locations=4

* adds damage_protection mechanic

* add xeno_disarm_chance

* ERT borg naming scheme: (level) ERT (number)

* std borg: tweaks hypo, RMs holoproj, adds mats/subsystems

* AA bullet_arc refactor

* refactors var/require_module to be bool, proc/action() to return bool

Suggested by farie82

* better radio for generalist

* rework gamma borgs, split of destroyer borgs

* dead robots fix

* fixes error caused by merging of PR 12932

* manually fix line endings

* fixes borg energy weapons (except disablers) not being recharged within recharging stations

* add trailing newline to make travis pass

* compatibility with #13471 life refactor

* deletes change to gamma sec ERT laser beam energy cost

* refactor handling of ash/lava immunities

* removes spiderlike mining borg sprite

* tweaks generalist borg loadout

* limit secborgs to 1 on green alert / roundstart

* re-run icondiffbot

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2020-06-28 14:16:14 -06:00
EMPlightandGitHub 9365120416 Merge branch 'master' into BulldogXLmag 2020-06-27 15:21:59 -07:00
Fox McCloudandGitHub b3d69aac9b Moves to BYOND 513 (#13650) 
* Fixes Orbiting

* moves to 513

* travis update

* check for minor version too
 2020-06-26 01:15:59 -06:00
EMPlight ce2ec83e01 Adds Extended drum mag and bundle for nuke ops. 2020-06-12 22:43:55 -07:00
AffectedArc07andGitHub 04ba5c1cc9 File standardisation (#13131) 
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
 2020-03-17 18:08:51 -04:00
joep van der velden fd913498bf Make every obj/.../New() call it's parents 2020-01-29 10:43:32 +01:00
Fox McCloudandvariableundefined d6a6debf94 Traits framework (#12548) 2019-10-15 20:12:46 -04:00
farie82andvariableundefined 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Coul d89d4dbc38 fixes some missing arguments and runtimes 2019-09-16 16:18:16 -04:00
Mark van Alphen 1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
xerdies f7cac39aa5 Initial fix. 2019-02-16 18:54:47 +00:00
xerdies 608d6f09c5 added ammo boxes, and added them to the materials so they can be printed. 2019-02-15 21:11:19 +00:00
xerdies 2fe8fc3073 Adding new sniper bullets. 2019-02-15 20:35:51 +00:00
xerdies 98c3a35174 Initial Commit for the Donksoft sniper. 2019-02-13 21:41:36 +00:00
Aurorablade d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
Granodd 6c53564df2 Merge branch 'master' into GunsAndGunAccessories 
# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm
 2019-01-26 02:17:22 -05:00
Aurorablade b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
Aurorablade 4fc35a68b1 Gonna have to clean some files after this. 2019-01-19 22:38:47 -05:00
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