cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,688 Commits 26 Branches 2 Tags
522390c0b981ca045202ab804ee9eb8a87149d3c
Commit Graph

427 Commits

Author SHA1 Message Date
E-MonaRhg
4ee75ce29d Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-27 16:37:58 +02:00
Qwertytoforty
c65a472888 Adds the BSG to RND designs (#16328) 
* Adds the BSG to RND designs

* Update code/modules/research/designs/weapon_designs.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-07-26 18:12:37 +01:00
SabreML
150e7e3f60 Painter Item Refactor (#15828) 
* Modular Painter V1

* Improved Suicide

* Type & Text

Also `item_state` just goes from `icon_state` so it's not needed.

* Modular Painter V2

Big refactor of everything to use datums rather than separate objects.

* Steel airlock stuff

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Vile Heresy

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
 2021-07-20 15:25:45 +01:00
E-MonaRhg
f83b8ae14e Suggested stuff 2021-07-09 19:44:02 +02:00
E-MonaRhg
09c13f7706 More grammar and flavor stuff that I certainly did not forget about 2021-04-06 02:50:58 +02:00
E-MonaRhg
7b342f4476 Hey, that compact defib thing is pretty cool, what if we had three? 2021-03-31 22:34:17 +02:00
Qwertytoforty
2e4e0d2e91 Adds reactive teleport armor construction, ports repulsive armor from TG (#15343) 
* Adds reactive teleport armor construction, ports stuff from tg to do it

* Adds description to what disabled does in code

* Fixes ashwalker tendril anomaly

* SaberML code suggestions

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* True or false

* Keeps reactive armors from triggering from kisses

* removes stun check

* oops

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-03-30 11:55:31 +01:00
Kepplerx
0b74b9e31f Update mechfabricator_designs.dm (#15515) 2021-03-28 12:39:36 +01:00
Fox McCloud
75935ff876 Converts Eye Augments to Cybernetic Eyes (#15519) 
* Converts Eye Augments to Cybernetic Eyes

* literally not used

* it helps when you properly include all the code

* flashlight eyes

* tweaks

* conflict resolution

* can't have two eyes

* order of operations matters here

* autosurgeon
 2021-03-03 20:21:30 +00:00
Fox McCloud
dcace52184 Makes the Clown All Powerful (#15612) 
* Makes the Clown All Powerful

* sadtrombone.ogg
 2021-03-02 16:16:47 +00:00
Fox McCloud
003a1f7cba Tank Refactor; Breathing Retool (#15371) 
* Tank Refactor Breathing Retool

* missed maps and doc

* just in case
 2021-01-28 20:57:37 +00:00
Fox McCloud
de795c4e31 Radiation Refactor (#15331) 
* First Commit

* visible radiation and engine goggles

* correction

* t-ray fix

* further adjustments and fixups

* gieger addition and cleaning fixup

* yet more fixes

* styling fixes

* fixes

* human glowing fix

* do the merge conflict avoidance dance

* Update supermatter.dm

* supermatter rads

* mapping in

* radiation doors

* yeah yeah line endings

* clean up

* styling issues

* showers
 2021-01-24 22:03:13 +00:00
danni boi
ca97f9a92d Windowpainter (#14888) 
* adds a window painting tool

* Update code/game/objects/items/devices/window_painter.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* gigit

* edited code to match steelslayer's suggestion

* Update code/game/objects/items/devices/window_painter.dm

OOF thank you for catching that

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: danni-boy <32673848+danni-boy@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-11-23 19:07:54 +00:00
Aquilar
8b8dd8f620 Adds a number of new implants (#14348) 
* adds CNS jumpstarter, hacking arm, janitorial arm and botanical arm implants.

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: RedWolfie <13683223+RedWolfie@users.noreply.github.com>

* Update augments_internal.dm

* Update augments_internal.dm

* error correction.

* new name for jumpstarter

* Update augments_internal.dm

* grammar

* taking some suggestions.

* adding a safe spraycleaner for the implant.

* more suggestions

* evenmoarsuggestions

Co-authored-by: RedWolfie <13683223+RedWolfie@users.noreply.github.com>
 2020-10-21 09:52:11 -04:00
Qwertytoforty
fbb34fe482 Gives engi/medical borgs an abductor tool upgrade from the exosuit fabricator (#14341) 
* Gives engi/med  borgs abductor upgrades

* Removes unneeded line

* Henks and Aquilars suggestion

Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
 2020-09-25 16:13:26 -04:00
Kyep
be024bbbcc Merge remote-tracking branch 'ParadiseSS13/master' into skills_rework 2020-09-19 06:39:38 -07:00
AffectedArc07
ce2f0d401d Swings the axe on modular consoles (#14355) 
* Swings the axe on modular consoles

* Experience will not save you in these parts
 2020-09-19 09:36:56 -04:00
Kugamo
3df2f3ac4e Adds Botany Jugs, and fixes hydroponic trays draining sealed containers [now without map edits] (#14212) 
* Adds Botany Jugs, and lid test for hydro trays

* adds 1u and 2u transfer amounts back to changed items

* fixed item references in some .dmm

* improves weed/pest killer jug sprites, and corrects overlays procs

* removes uneeded image def

* improves sprites further

* adjusts coloring of l4z reagant

* Buffs Jugs to 80u each (from 50u)

* balances nutrient vending numbers

* resizes jugs

* fixes conflict in .dmi

* Resizes Jugs again

* removes commented out code

* Fixes

* futher fixes

* Fixes some issues, adds sounds for jugs.

* reverts to using New()

* removes jug.dm and reverts all nutrient back to bottles
 2020-09-18 01:14:19 -04:00
ppi13
0b23e89fa5 Balances the safety override module and Fixes #14172 (#14177) 
* Change safety override tech requirement and make it only unlock weapons instead of having the same effect as emag
 2020-09-16 10:06:49 -04:00
Kyep
995165ae38 fixes merge conflict 2020-09-15 11:39:00 -07:00
AffectedArc07
5367a8c9a9 Merge remote-tracking branch 'ParadiseSS13/master' into sm-monitoring-console 2020-09-14 22:34:09 +01:00
AffectedArc07
db560898a2 Merge pull request #14208 from TDSSS/stethoscope 
added stethoscope to the autholathe
 2020-09-06 10:11:16 +01:00
TDSSS
c65940dc2e added stethoscope autholathe design 2020-09-01 15:10:25 +02:00
Oyu-De
52a17762fd Fixed "Equipement" to "Equipment" 2020-08-31 20:40:27 +03:00
Kyep
e3b82a70a3 Replaces skills computer with skills HUD eyewear 2020-08-17 06:02:55 -07:00
AffectedArc07
9401b38450 Supermatter Monitoring Console 2020-07-29 22:56:08 +01:00
Mitchell
c718a1688e FLASHOUT 2020-07-20 18:07:41 -05:00
SteelSlayer
e8b64acaab Adds the airlock painter (#12687) 
* Adds the airlock painter

* 5 am push, pls don't break

* uses assoc lists, add do_after, painter attack_self

* more upgrades

* remove random whitespace

* better logic

* initial over new, flags, manually sort the list

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
 2020-07-13 15:52:34 -04:00
Fox McCloud
1ec53a35b3 Merge pull request #13615 from TDSSS/xray-rnd 
change tech requirement for xray implant
 2020-07-07 13:41:58 -04:00
Kyep
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
AffectedArc07
6fddb72efd Fixes bad tcomms board naming 2020-06-27 08:40:54 +01:00
AffectedArc07
8294741b50 Removes some old and broken features 2020-06-21 21:12:27 +01:00
TDSSS
1c6234cf31 change tech requirement for xray implant 2020-06-14 19:55:23 +02:00
Fox McCloud
9d755e4b00 Merge pull request #13446 from AffectedArc07/tcomms-overhaul 
Telecommunications Overhaul
 2020-05-25 18:51:58 -04:00
Fox McCloud
bf796cf8fc Ports Cybernetic Ears (#13438) 
* Ports Cybernetic Ears

* gosh darn new lines
 2020-05-24 13:54:54 -04:00
AffectedArc07
d97a20aa3c Integrates NTTC + Other Stuff 2020-05-15 19:48:53 +01:00
AffectedArc07
64dc83846e Main part works. but we still got a long way to go 2020-05-14 22:46:26 +01:00
Fox McCloud
faecf7cbfa Patch rework (#13062) 
* Patch Rework Part 1

* applicator

* fixes

* fixes

* temperature settings

* single application patches

* additional

* new line fix

* fox  is a derp sometimes
 2020-05-02 20:07:43 -04:00
AffectedArc07
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
AffectedArc07
5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
Fox McCloud
cd857e378e Removes Creatable Video Cameras 2020-03-04 12:57:23 -05:00
AffectedArc07
c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
streather
683640de24 fixing autolathe type 
fixed a typo, changed compressed matter cardridge to compressed matter cartridge
 2019-10-09 23:44:59 +01:00
Fox McCloud
c8eebd1b4b Adds Leather to Biogenerator (#12514) 2019-10-08 21:12:09 -04:00
Fox McCloud
affa319fab Removes Console Screens (#12512) 2019-10-08 21:07:50 -04:00
Fox McCloud
efc79cfc7c Removes Bodyscanner Console (#12377) 2019-09-22 21:11:02 -07:00
variableundefined
1dc8e66cbc Merge pull request #11772 from Couls/constructable-rechargers 
[READY] Constructable Rechargers and machinery tweaks
 2019-08-23 09:16:37 -04:00
Crazy Lemon
3313efed23 Merge pull request #11981 from Fox-McCloud/lavaland-update 
Major Lavaland Update
 2019-08-16 22:22:49 -06:00
variableundefined
11e9ecadbf Merge pull request #11894 from TheSardele/blender 
Makes All-In-One Grinders constructable
 2019-08-16 20:41:18 +08:00
Fox McCloud
3634687a88 Merge pull request #11374 from Quantum-M/removeTeleBoards 
Removes telescience boards from RnD
 2019-08-11 16:28:47 -04:00