cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 05:57:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,505 Commits 14 Branches 2 Tags
tgs-dmapi-update
Commit Graph
74 Commits
Author SHA1 Message Date
RyanGitHubHenri215
 		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
GDNandGitHub a3dfd062b3 CE's blueprints can now see wires (#20143) 2023-01-13 17:08:41 +01:00
Vi3triceandGitHub 9e90c81282 Defining Part 1 - Code cleanup toward defines (#19262) 
* This is only the beginning

* Update stack.dm
 2022-10-10 20:50:29 +02:00
LumiandGitHub 42a94fe37c Grammar and spelling edits (#17485) 
* Grammar and spelling fixes

Grammar and spelling fixes

* 'an addition', 'look yummy'

Fixes 'a new addition' to 'an addition', reverts 'looks yummy' to 'look yummy'
 2022-03-19 11:01:14 +00:00
SabreMLandGitHub 0b375de42c Removes the the vast majority of 'The the' from the the code (#15597) 
* The the

* Some more

* Review 1

* A couple more
 2021-06-20 10:20:32 -04:00
AffectedArc07 f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Deelite34GitHubFarie82
 		8015d59f82 Revert log_game change2 
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-03-08 19:45:01 +01:00
Deelite34GitHubFarie82
 		f7c5eb274a Revert log_game change 
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-03-08 19:44:45 +01:00
deelite34 7fe8e28fa8 Fix duplicate ? and FLW appearing 2021-03-08 16:51:24 +01:00
deelite34 cf693dde91 Fix coordinates not showing up in logs, when you create new area with station plans 2021-03-05 14:48:15 +01:00
QwertytofortyandGitHub 68be2cbe8b Logs-blueprint-naming (#15525) 2021-02-18 16:04:26 +00:00
Fox McCloudandGitHub aa86510c54 Turf Refactor, Part 1: Purging /turf/simulated/shuttle (#15454) 
* Turf Refactor, Part 1: Purging /turf/simulated/shuttle

* everything but shuttle templates

* it is done

* titanium airlocks

* correcting multi-turfs
 2021-02-07 11:06:55 +00:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
Fox McCloud f13ae9e167 Overhauls and Refactors Alarms 2020-07-01 17:41:47 -04:00
Fox McCloudandGitHub c87e4bd5c7 Merge pull request #12950 from Aquilar/blueprintpinpointerfix 
Fixes steal station blueprints objective
 2020-05-01 18:36:08 -04:00
AffectedArc07andGitHub 210f8badf4 Makes all global variables handled by the GLOB controller (#13152) 
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
 2020-03-20 21:56:37 -06:00
Aquilar 6064243009 simpler 2020-03-15 12:59:36 +08:00
Aquilar fa84366203 Added an icon to differentiate the blueprints from the CE's blueprints. purely to prevent confusion. 
Fixed the pinpointer from pointing to cyborg and slime blueprints by;
Changing the steal objectives to require the CE's copy of the blueprints exclusive. Which required changing few lines in various places that reference that specific copy.

Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>

missed the line in photography.dm
 2020-02-01 19:06:03 +08:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
unknown 8aa5bbdb9c removed unnecessary == TRUE 2019-07-06 14:26:42 -04:00
unknown ded7e4be67 fixed a bug where construction permits deleted themselves prematurely 2019-06-30 20:49:37 -04:00
Mark van Alphen bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02:00
datlo 912c6b0b9e asteroid claim improvements, golem ship security 
Add plating over asteroid tiles if you've claimed them

Asteroid walls can now be used to define rooms (still must be airtight)

Add golem check to the free golem ship
 2019-02-03 15:59:04 +00: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
Sam 07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Mark van AlphenandGitHub fe62b212b4 Merge branch 'master' into lavaland_megafauna 2017-02-02 20:17:31 +01:00
uraniummeltdown 7259e4ce07 blueprints for engiborgs 2017-01-31 19:22:29 +04:00
Markolie e5c4b78f47 Add Colossus, add outdoors variable to areas and update fireball targeting 2016-10-25 04:10:52 +02:00
Krausus 92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
Tigercat2000 71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Tigercat2000 bee2954d7b Ports holomap blueprints from tg/vg. 
Changes:
 - Clicking "view structural data" in the station blueprints menu will
   show you ghost images of where things like disposal pipes, wires,
   atmospherics pipes, and other power machinery are originally supposed
   to go. Note, this will show you the ghost images over turfs even if the
   machinery is destroyed.
 2016-05-05 22:05:39 -07:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message) 
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
 2016-04-05 08:15:05 -07:00
Fox-McCloud 6648175a63 Ports Advanced Cameras 2016-03-29 06:05:59 -04:00
Certh 80f64e73df Fixed text error when using blueprints 2015-11-24 16:19:11 +01:00
Certh 1ce08fee64 Tiny grammar fix 2015-11-24 16:03:16 +01:00
Tigercat2000 c6a4fdc374 Replace 2 A.name==Space checks with istypes 2015-05-22 11:23:20 -07:00
Tigercat2000 e1249fc640 Lighting overhaul. 
This commit overhauls the lighting system to Bay12 standards. It is better
in pretty much every way.
 2015-05-10 12:03:27 -07:00
Tigercat2000 b8101ed6be w_classes, NEED W_CLASSES, gaah. 2015-03-26 19:21:32 +01:00
Tigercat2000 62f72163c7 Compileerrorfix, update items.dmi 2015-03-26 19:00:25 +01:00
CheridanandTigercat2000 acba4c6cf6 Adds construction permits 
Conflicts:
	code/game/gamemodes/objective_items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/paperwork/photography.dm
	icons/obj/items.dmi
 2015-03-26 18:52:29 +01:00
Markolie c4da1e66d9 Fix wall smoothing 2015-01-08 19:44:56 +01:00
Artorp 5a22e5e8dd Station Blueprints fix 
Fixes the station blueprints.
 2014-08-09 09:24:02 +02:00
Rob NelsonandZomgPonies 9227481a8a Standardize windows. 
Conflicts:
	code/WorkInProgress/buildmode.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/twohanded.dm
	code/game/objects/structures/window.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
 2014-04-19 19:36:33 -04:00
alex-gh 521ad31671 Revert the new lighting system. 2014-04-07 23:51:35 +02:00
Rob NelsonandZomgPonies 5c8ddf2a31 YOOOOO0U. YOU GOT WHAT AH NEEEEEEEED 
Conflicts:
	code/__HELPERS/game.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/firedoor.dm
	code/modules/client/preferences_toggles.dm
	code/setup.dm
	maps/tgstation.2.1.0.0.1.dmm
 2014-03-11 02:28:58 -04:00
ArynandZomgPonies 5b2f811b71 Lighting system is too buggy to continue until I know wtf is going on 
Conflicts:
	baystation12.dme
	code/game/turfs/turf.dm
 2014-02-28 17:47:50 -05:00
YotaXPandZomgPonies b7efb1b7ed Optimized and refactored list2text, text2list, and replacetext. 
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm

Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/detectivework/scanner.dm
 2014-01-08 07:14:16 -05:00
Chinsky 4d7aa320cb Due to git tree being fucked up for some reason, manually reapplied many man many fixes. 
Just got to tip of real tree and got zipball, then unpacked it here.
 2013-02-07 07:13:27 +04:00
Cael_Aislinn bb5a349fcf Merge branch 'incremental_tg' r5600 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/controllers/master_controller.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/implants/implantnanoaug.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/say.dm
	code/modules/mob/mob_defines.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/modules/projectiles/projectile.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/setup.dm
	config/config.txt
	html/changelog.html
	icons/effects/effects.dmi
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	maps/tgstation.2.1.0.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:23:37 +10:00