cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 03:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 26 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

712 Commits

Author SHA1 Message Date
Fox-McCloud
f84ca26012 Fixes and Stuff 2014-11-11 22:48:08 -05:00
Markolie
2e0953a767 And re-adding my changes. 2014-11-09 05:39:01 +01:00
Markolie
7405ae30ee Camera console network rework 2014-11-08 23:12:38 +01:00
Fox-McCloud
9b6dc5cdb5 Merge pull request #458 from Markolie/master 
Magistrate/Psych Office shutter fixes, telescience console UI update, camera fixes, borg movement fix, security windoor fix, CentComm identification computer fix, locker fixes
 2014-11-06 03:18:14 -05:00
Fox-McCloud
dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
Markolie
4653d922af Just as a safety precaution in case the client can unset the disabled option on the buttons. 2014-11-02 19:37:06 +01:00
Markolie
904be8db74 Updated Telescience Console to use the updated Nano UI, rather than the regular pop-up UI. I was going to stick with just ensuring the console itself updates when you edit one of the coordinates (as previously you'd have to re-open the pop-up), but I figured I might as well update it to the newer Nano code. 2014-11-02 04:24:25 +01:00
Bone White
46adb0dd0c Support Jobs on ID Comp Fix 
Finally puts support jobs back on the ID (HoP) computer.

Removed NT rep from the list of positions that can be chosen (as it's a
central assigned position only).

Slightly altered the colours of the interface to make it easier to read.
 2014-10-28 11:39:12 +00:00
Bone White
c23a8d3513 Adds traitor station z level 
also access via telescience with emag and z level set to 7
 2014-08-28 14:58:17 +01:00
VampyrBytes
896021c967 couple of fixes 
fixes MP's ending up with 2 heads on death
fixes cloning machine cloning species that are meant to be uncloneable
 2014-08-10 11:11:21 +01:00
Walter0o
570fd2756b robot computer emagging exploit fix 
so an emagged borg can in turn emag all others ?
the more you know.
seems extremely OP to me but i am just closing the exploit, not changing the game.
Conflicts:
	code/game/machinery/computer/robot.dm
 2014-08-03 15:06:16 -04:00
Ccomp5950
6be2c0d0fe Crew Monitor will no longer show "weird characters" 
It has been talked to and feels very sorry for it's actions.

Well that and NanoUI doesn't like byond text-macros (/improper) in this case, so we just sanitize it just incase the crew monitor isn't playing nice that day.

Conflicts:
	code/game/machinery/computer/crew.dm
 2014-07-23 09:10:55 -04:00
Rob Nelson
471bc24c1e Standardize computer luminosity shit, deduplicate power stuff. 2014-07-20 16:17:19 -04:00
dylanstrategie
4e10136895 Added luminescence to some computers 
- Added colored lights to all listed computers
- Should be fullly functional
- Uses the code Pomf used for Telecomms Computer testing

Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/station_alert.dm
	code/game/machinery/telecomms/traffic_control.dm
 2014-07-20 11:07:59 -04:00
Mark Aherne
de81fdd4ac Added PDA check in wear_id slot to get any potential id rank. 2014-07-19 02:12:27 -04:00
Mark Aherne
8ddf65012c Improved Crew Monitoring Console map. 
Added icons for use with map.
 2014-07-19 02:12:12 -04:00
Mark Aherne
ec29e88224 Added a station map to NanoUI, this map can be used by any NanoUI to display live/dynamic elements on a map. 
The map functionality has been added to the crew monitor console to show active crew trackers, this is working but needs refinement (icons etc.).

Conflicts:
	code/modules/nano/nanoui.dm
 2014-07-19 02:11:44 -04:00
ZomgPonies
54359a4e2c Merge pull request #297 from VampyrBytes/master 
Fix for xray + telescience irradiate
 2014-07-17 06:59:07 -04:00
JimTheCactus
24a423776d Fixed not-quite-blank field issues in the various record keeping computers. 
Added trim to most fields in Medical Computer
Added trim to most fields in Staff Computer
Added name verification in Staff Computer
Added trim to most fields in Security Computer
Added name verification in Security Computer

Conflicts:
	code/game/machinery/computer/medical.dm
	code/game/machinery/computer/security.dm
 2014-07-16 09:34:52 -04:00
VampyrBytes
5d4a9ef58c Fix for xray + telescience irradiate 
Stops people who can see through walls getting irradiated by the telepad
 2014-07-16 11:47:04 +01:00
ZomgPonies
4bfb46037f Moar Object verb removal/switch to right-click 2014-07-15 09:18:37 -04:00
Mark Aherne
9b45dbabfb Continued work in progress on a major revision of the NanoUI templating system. 
Conflicts:
	code/ATMOSPHERICS/components/omni_devices/filter.dm
	code/ATMOSPHERICS/components/omni_devices/mixer.dm
	code/game/dna/dna_modifier.dm
	code/game/machinery/cryo.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/modules/nano/nanoexternal.dm
	code/modules/nano/nanomanager.dm
	code/modules/nano/nanoui.dm
	code/modules/power/apc.dm
	code/modules/power/smes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
	nano/js/nano_update.js
	nano/templates/escape_pod_console.tmpl
 2014-07-15 07:22:15 -04:00
d3athrow
6be6347a1f Glowing computers to start 
Conflicts:
	code/game/machinery/computer/power.dm
 2014-07-13 16:03:12 -04:00
Zuhayr
9d96b16c74 Fixes an access issue with the ID computer. 2014-06-29 21:21:36 -04:00
ZomgPonies
cb9b6fca4d Replacing civilian with support department. Still need to make changes on MySQL schema. 2014-06-26 19:42:14 -04:00
mwerezak
e6944b989c Adds shuttle controller 
Moves all ferry shuttle processing into one place: the new shuttle
controller.

Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.

Conflicts:
	code/controllers/master_controller.dm
	code/controllers/verbs.dm
	code/game/supplyshuttle.dm
	code/modules/shuttles/shuttle.dm
 2014-06-24 07:06:48 -04:00
mwerezak
9874ce38ce shuttle_controller now uses a shuttle datum 
Conflicts:
	code/game/machinery/computer/communications.dm
	code/modules/admin/verbs/randomverbs.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/power/singularity/singularity.dm
 2014-06-23 11:07:58 -04:00
Chinsky
7bdc096ee1 Optimizes crew console scanning to only look for mobs instead of ALL clothing items in the world. 2014-06-22 06:29:02 -04:00
ZomgPonies
d2129f5a01 Revert "optimize crew monitor's scan()" 
This reverts commit 8e245f527db4a00088fc2b7b8576fadc11875a6a.

Conflicts:
	code/__HELPERS/global_lists.dm
	code/modules/clothing/clothing.dm
 2014-06-22 06:28:41 -04:00
Mloc-Argent
40b0ecf006 optimize crew monitor's scan() 
New global list, "clothing_list".

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/__HELPERS/global_lists.dm
	code/modules/clothing/clothing.dm
 2014-06-21 17:35:31 -04:00
ZomgPonies
53ac0c4c79 Merge pull request #267 from Bone-White/master 
Vox clone scanner and NO_SCAN fix
 2014-06-20 10:00:42 -04:00
Bone White
61578a5880 Vox able to be cloned fix (2) 
Minor syntax fix
 2014-06-20 14:10:40 +01:00
Bone White
c533429c94 Vox able to be cloned fix 
Should make the dna scanner not scan vox dna (or anything with the
NO_SCAN flag).
 2014-06-20 12:55:16 +01:00
Rockdtben
b5f20138f9 Security Console now uses the Player Panel New search. 
Conflicts:
	code/game/machinery/computer/security.dm
 2014-06-17 02:20:26 -04:00
Zuhayr
361503fa8b Converted Syndicate shuttle over to multi-shuttle setup. 
Conflicts:
	baystation12.dme
	code/game/gamemodes/nuclear/pinpointer.dm
 2014-06-14 02:25:15 -04:00
Zuhayr
4385b1320c Moved the Vox skipjack console over to a multi-destination shuttle datum setup. 
Conflicts:
	baystation12.dme
	code/game/gamemodes/vox/heist/heist.dm
	code/game/machinery/computer/vox_shuttle.dm
 2014-06-14 02:22:11 -04:00
Zuhayr
e4b95aa05e Moved engineering, research and mining shuttles to a generalized system with its own directory structure. 
Conflicts:
	baystation12.dme
	code/modules/mining/mine_items.dm
	code/modules/research/research_shuttle.dm
 2014-06-14 02:01:14 -04:00
nyanpasu
4aad7c1738 Modified power monitor to output to a formatted table. 
Conflicts:
	code/game/machinery/computer/power.dm
 2014-06-08 17:27:28 -04:00
Zuhayr
4f37a924fe Replaces the derelict, modifies the DJ station, adds a shuttle bay to Engineering. 
Conflicts:
	baystation12.dme
	maps/tgstation2.dmm
 2014-06-04 15:30:09 -04:00
GinjaNinja32
82762e1504 Fix NanoUI autoupdating 2014-06-03 16:38:08 -04:00
GinjaNinja32
a767d8b084 Change crew monitoring computer to use NanoUI 
Conflicts:
	nano/css/shared.css
 2014-06-03 16:37:56 -04:00
ZekeSulastin
b13b4d2392 Adds languages to DNA2 cloning records 2014-05-27 14:03:03 -04:00
ZomgPonies
413dcf9cdd Add karma jobs to the new ID computer framework 2014-05-26 06:40:50 -04:00
mwerezak
40baf28c7d Setting RD board access now uses visible_message 2014-05-26 06:21:15 -04:00
mwerezak
418ba281d7 Fixes circuit var for other consoles 
Also cleans up attackby while we're at it.

Conflicts:
	code/game/dna/dna_modifier.dm
	code/game/machinery/computer/arcade.dm
	code/game/supplyshuttle.dm
	code/modules/mining/mine_items.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/research/research_shuttle.dm
	code/modules/research/server.dm
 2014-05-26 06:21:03 -04:00
mwerezak
dd2fcf0eb3 Fixes RD console circuit var not set. 
Also removes redundant attackby code, and small change to text when
setting access protocol on the board.

Related to issue #5006
 2014-05-26 06:13:37 -04:00
jack-fractal
3df35fe03c modifying visibility interface of ai to use generic visibility_interface 
Conflicts:
	baystation12.dme
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/modules/mob/living/silicon/ai/freelook/cameranet.dm
	code/modules/mob/living/silicon/ai/freelook/chunk.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
 2014-05-15 04:43:49 -04:00
Jeremy Liberman
0c01c6e4df Prevent request forgery exploit in card.dm 2014-05-15 01:02:18 -04:00
Jeremy Liberman
bd249e3a53 Mutiny Mode 
Conflicts:
	code/__HELPERS/time.dm
	code/controllers/hooks-defs.dm
	code/controllers/hooks.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/podmen.dm
	code/modules/admin/player_panel.dm
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
	code/modules/security levels/keycard authentication.dm
	code/setup.dm
	icons/mob/mob.dmi
 2014-05-15 01:01:54 -04:00
Zuhayr
8c3ea8dac6 Made drone control consoles buildable/researchable. 2014-05-12 04:36:19 -04:00