cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-02-07 15:19:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,997 Commits 31 Branches 2 Tags
9eac813007fd39bcd2d58bd2777b3692a38fd86e
Commit Graph

22 Commits

Author SHA1 Message Date
Ryan
7c3cd86f14 APC & Machinery Refactor + Local Powernets (#19991) 
* local powernet and machine power refactor

* some fixes

* more tweaks + powerchange() refactor

* fixes var edited apcs on meatpackers.dmm

* fixes issue with power channels

* Reviews

* delta fix

* Update code/game/machinery/portable_turret.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* removed area power change proc

* damn morgues

* requested changes

* request changes

* deconfliction

* mapping fixes

* some fixes from TM

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-01-30 22:28:10 +00:00
Henri215
1bdc60de9d Tweaks to Vendomat and Artvend (#19967) 2023-01-05 12:23:19 -06:00
Sirryan2002
61145a02f8 [TGUI] Space Credit Economy Overhaul + Supply Point -> Space Cash (#19209) 
* initial edits

* initial edits

* converting shit over to machinery/economy

* vending and mapping fixes

* vending fix pt.2

* Converts Supply Economy to Use Space Credits instead of Supply Points

* Job Payment, NanoBank, and Paychecks

* clothing type path fixes (damn merge conflicts)

* fixes map typepath issues

* adjusts supply prices

* Vendor Price Adjustments

* account uplink terminal tweaks

* please pass tests

* Apply suggestions from code review

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

* reviews and bug fixes

* Review Suggestions/Fixes and Request Console Rewrite

* edits

* vending changes for merge

* typepath fix

* final tweaks

* proc ref fixes

* Fixes and Tweaks from 2nd TM

* rebuild TGUI

* final tweaks

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* requested reviews

* tweaks

* updates slot machine winnings

* fixes

* GC fixes

* fixes

* oops. still need to deconflict this

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* requested changes and bug fixes

* atm runtime fix

* requested reviews

* vend act stuff

* attempt to pass tests

* supply packs fix

* user tochat -> debug log

* FINAL FIXES

* removes CC db stuff

* Apply suggestions from code review

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2022-11-21 23:30:50 +00:00
Sirryan2002
f2813a6730 Complete Library Overhaul Part 1 (#17832) 
* first edits

* more commits yay

* more changes

* Update paradise.dme

* changes

* more edits

* more edits

* changes

* more changes

* changes

* more stuff

stuff

Update tgui.bundle.js

* FUCK

* Many UI changes

* Update Lib Computer UI and Correct Map Issues

* squashed commits :)

Guts Old Book/Manual Code and Reworks it
final (almost) touches

* this should pass tests now

* fixes random ruin having a removed object

* adds review suggestions

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* squashed commits :)

update schema
adds python requested changes
implements proper python & sql scripts
applies some requested changes + minor fixes
bump SQL version to 40

Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Apply suggestions from code review

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

* applies requested changes from code review

* lets pass some tests today

more fixes

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* more requested changes fulfilled

* should fix map issues + a couple other things

* fixes & sanitization stuff

* Apply suggestions from code review

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

* updates UI and implements more requested changes

* mother of bug fixes & UI cleanup

* removes unused code

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* fixes

* adds GC checks

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* requested changes + TGUI Cleanup and Styling

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-07-09 14:55:12 +01:00
S34N
0cc1ebd46c [MDB Ignore] Refactors spawners, adds unique icons to spawner effects (#17238) 
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
 2022-01-09 22:10:00 +01:00
SabreML
036a69fea4 Removes pixel_* = 0 and tag = "icon*" from the map files (#15438) 
* Pixel Removal

Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Fix

Why is that even there?

* Fix

Apparently I did the regex stuff in the wrong order for `Lavaland.dm`. Whoops

* Unit tests

* Mother of all map edits

* `tag = "icon` purging

* No area check

Far too much code debt for this PR to cover, but soon...

* At request

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-07-14 23:07:12 +01:00
variableundefined
18b270cb7e Remove the structure/chair/wood/normal subtype, moving all properties to its parent. 2019-09-11 00:28:27 -04:00
Fox McCloud
1a5c25603e mapping is a pain 2019-08-27 18:32:28 -04:00
AffectedArc07
433a22bb81 Mapmerge2-2 2019-03-03 01:02:32 +00:00
Granodd
4b0cef8fb6 Fixes map conflicts. 2018-11-23 20:10:06 -05:00
Purpose
efbcd54cf2 Fully refactors Chairs, Stools & Beds. Adds a few fun bits 2018-09-14 18:40:42 +01:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
uraniummeltdown
a2038d40b3 makes door code more OOP: reduced copypasta in shutter and poddoor code, they have their own icon files, changed name of icon_states in the maps 
added a few defines and helpers
do_after family supports callbacks
added airlock security levels to airlocks
obj_integrity for doors, door assemblies, firelock frames
vault door assembly is 8 plasteel up from 6
explosion_block works better
heavy firelocks block explosions, firelock (de)construction uses crowbar instead of welder
xenos can open airlocks
minor change to attacking obj message
 2018-03-04 13:52:55 +05:00
uraniummeltdown
9312f1fb7d airlock assembly states have defines, removed redundant door layer defines 
added abductor airlocks from /tg/
station2 airlocks have a solid version, added external maintenance airlocks
added airlocks to RCD
survival pod airlocks have a solid version
door assemblies have examine hints, give more feedback, use overlays, mineral assemblies can have glass installed, use deconstruct() proc
multi tile airlocks have a solid version
moved airlock-specific procs to airlock_types.dm
airlocks use overlays now
airlocks use deconstruct() proc
map edits done to ensure nothing changes
some old airlock icons kept in due to use as /door/unpowered by away missions
airlocks open faster, delays between frames of icon states halved
added isshade() and isconstruct() helpers
cult airlocks will show their overlay
fixes plasteel material amount
 2018-01-22 20:27:34 +05:00
uraniummeltdown
7f4c9263ce removes table parts, adds table frames 
table/woodentable -> table/wood
tables are built by applying stacks to table frames
altered table construction
cleaned the code and increased obj_integrity of some tables and racks
lowercased 'carpet'
 2018-01-12 23:22:55 +05:00
Tigercat2000
31aab5452b -tg- smoothing/floor refactor 
Squashed:

Add plasteel goonplaque turf

Builtin_tile nulling

Levelupdate()

Fix falsewalls, update smoothing.dmm

fixes rwall decon
 2016-01-03 19:24:13 -08:00
Markolie
89665cfe5c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms 
Conflicts:
	_maps/map_files/RandomZLevels/moonoutpost19.dmm
	_maps/map_files/cyberiad/cyberiad.dmm
	code/controllers/master_controller.dm
	code/game/machinery/alarm.dm
	code/modules/power/apc.dm
 2015-08-03 00:04:24 +02:00
Markolie
73e94b5dc4 Alarm system overhaul 2015-08-02 07:13:03 +02:00
Markolie
3a9dc7b063 Fix all away missions 2015-08-01 22:50:12 +02:00
Tigercat2000
177db675d6 Replace all instances of /area alone to /area/space 
This commit replaces every instance of /area(blank) with
/area/space(blank). The world default area has been replaced with
/area/space.
 2015-05-22 11:22:38 -07:00
Tigercat2000
9dff485066 Update map system to -tg- standards 
This commit updates the map system to -tg- standards. All stations are
defined under _maps/, and all .dmm files go under _maps/map_files/.

Currently, only the NCS Cyberiad is setup under the system.

Misc changes:
 - World Status contains the map name
 - dm.sh script will allow automatic map changing between restarts.
 - _globalvars folder starting to take shape, not everything is migrated
   there yet.
 2015-05-11 11:09:18 -07:00