cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-24 01:02:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,489 Commits 26 Branches 2 Tags
96840368d40f49d172cb15c39cc9a9cb8c835615
Commit Graph

400 Commits

Author SHA1 Message Date
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
Fox McCloud
ee0447dad6 Major Lavaland Update 2019-08-10 22:36:55 -04:00
TheSardele
a4485969db Cleans up some reagentgrinder code 
Removes a double check and fixes the circuit board description.
 2019-07-21 10:18:19 +02:00
TheSardele
30f313cb93 Makes All-In-One Grinders constructable 
All-In-One Grinders can now be constructed from a machine frame using the appropriate circuit board, 2 manipulators and a matter bin.
 2019-07-19 17:58:52 +02:00
Couls
cf31a774a5 Rechargers can be built now 
Rechargers now use capacitors as their stock parts and recharge faster depending on the quality of the recharger(may need balancing)
Can now also place smaller machinery on tables by clicking on the table while pulling them(microwaves and soda dispensers are some examples)
 2019-07-01 01:19:17 -04:00
variableundefined
12b20b594d Merge pull request #11738 from evankhellparadise/portableseed 
Portable Seed Extractor design
 2019-06-29 09:23:22 +08:00
Evankhell
caad8f8e5e Portable Seed Extractor 2019-06-21 20:06:06 -04:00
Couls
fc2488c80e new medical category in mechfab 2019-05-13 01:36:11 -04:00
variableundefined
56977dc052 Merge pull request #11376 from Arkatos1/Cardboard 
Cardboard can now be made in the Biogenerator
 2019-04-29 23:08:16 +08:00
Arkatos1
85cb74bec5 Cardboard can now be made in the Biogenerator 2019-04-25 12:27:32 +02:00
Arkatos1
fea1721d80 Pill Bottles are now printable in the Autolathe 2019-04-25 00:01:57 +02:00
B.A.L
d1f6ffc7aa Removes boards 2019-04-21 14:52:59 -07:00
CornMyCob
de3d84124a plasma cutter changes 2019-04-05 18:56:20 +01:00
variableundefined
06a9770ae4 Merge pull request #11157 from Fox-McCloud/chem-master-refactor 
ChemMaster Refactor
 2019-04-01 23:06:42 +08:00
variableundefined
456320cbe0 Merge pull request #11144 from Fox-McCloud/chem-dispenser-refactor 
Chem Dispenser Refactor
 2019-03-29 20:28:14 +08:00
Fox McCloud
be1a2b4452 ChemMaster Refactor 2019-03-28 19:41:17 -04:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Fox McCloud
41c03e03d9 Chem Dispenser Refactor 2019-03-26 18:29:11 -04:00
AffectedArc07
ca5f456f79 whoops 2019-03-09 10:31:37 +00:00
AffectedArc07
8bef0cd2e2 Adds in cell management console 2019-03-09 10:31:35 +00:00
Dave
ebe99e8986 Applies what my mom taught me about conflict resolution 2019-03-01 18:51:04 -05:00
Fox McCloud
b8a9f127bf Adds Upgraded Cybernetic Heart 2019-02-25 01:15:53 -05: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
Unknown
5ab0af3b25 Medical QoL PR 2019-02-15 00:10:08 -05:00
datlo
74a3631741 compilin and mostly workin 
has runtimes due to body color
need to wrap up commented procs
 2019-02-03 06:40:50 +00:00
Jazz23
cdec3a53d2 Matching naming conventions. 
All the other ones are like this.
 2019-01-11 09:45:51 -08:00
Jazz23
5403e5afef Bluespace Closet Addition 
Heckin yes dude
 2019-01-08 17:44:18 -08:00
variableundefined
c95f9b9c69 Merge pull request #10587 from TDSSS/irc-cost-increase 
Added titanium cost to IRC chassis
 2019-01-06 16:15:33 +08:00