cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,741 Commits 8 Branches 0 Tags
d293b9ea255c4e664c6cb0ca490b8265d82c1286
Commit Graph

130 Commits

Author SHA1 Message Date
PsiOmegaDelta
d293b9ea25 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-08-27 08:53:22 +02:00
GinjaNinja32
c1ff84dd97 properly fix #7884 2015-08-25 09:11:23 +01:00
GinjaNinja32
ec043ea392 Revert "Revert "Fixes #7884, should fix #10859"" 
This reverts commit c1dc9d3f7e.
 2015-08-25 09:10:11 +01:00
Chinsky
c1dc9d3f7e Revert "Fixes #7884, should fix #10859" 2015-08-25 03:35:19 +03:00
GinjaNinja32
a2c121ed50 Fixes #7884, should fix #10859 2015-08-24 21:59:12 +01:00
PsiOmega
ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
 2015-08-12 21:18:18 +02:00
PsiOmegaDelta
3e4ec4d7b7 NanoUI windows now close on Destroy(), preventing all sorts of qdel issues. 2015-08-12 09:41:22 +02:00
GinjaNinja32
41965d93ef Mirrors no longer check the user's gender when finding the list of valid hairstyles 2015-08-12 01:00:43 +01:00
GinjaNinja32
ea76feb3cd Compile fix 2015-08-11 18:47:25 +01:00
GinjaNinja32
631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
 2015-08-11 18:47:05 +01:00
PsiOmegaDelta
211a427d65 Crew monitor balance and lag fixes. 
Creates a central repository for crew data. This repository only updates data as necessary and only every 5th second, no matter how many times it is requested.
Reduces any lag caused by having multiple crew monitor windows open and as a bonus gives antags a larger window of opportunity for disabling sensors before detection of harm.
 2015-08-11 09:27:18 +02:00
PsiOmegaDelta
3e266ab377 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-05 09:25:53 +02:00
PsiOmegaDelta
6b01a67c50 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/nano/interaction/default.dm
 2015-08-05 09:16:50 +02:00
GinjaNinja32
595b58197d fix pAI radios not working 2015-08-05 00:49:28 +01:00
PsiOmega
9c4a0a91c0 Fixes crew monitor runtime and removes dead code. 
The crew monitor used src instead of nano_host(). Also removes unneeded Topic() href.
 2015-07-28 21:33:14 +02:00
PsiOmega
bd6ec4a98e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/atoms.dm
	code/game/machinery/rechargestation.dm
 2015-07-26 10:21:36 +02:00
PsiOmega
835d4ddcde Fixes #10267. 
Laws are always pre-sanitized.
 2015-07-25 13:30:25 +02:00
PsiOmega
7dc5e7e3af Compilation fixes. 2015-07-17 23:21:59 +02:00
PsiOmega
34b0517578 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/topic.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/nano/modules/atmos_control.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
 2015-07-17 23:19:34 +02:00
GinjaNinja32
efaf8659b8 Fixes usage of isAI() 2015-07-15 15:51:11 +01:00
PsiOmegaDelta
34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm
 2015-07-14 08:21:12 +02:00
PsiOmega
f601ba45d6 Fixes #10144. 
Fixed depricated type path.
 2015-07-13 09:53:21 +02:00
PsiOmega
60f6a2ea10 Fixes antags being able to see the appearance changer. 
Sets invisibility level to MAXIMUM.
 2015-06-21 21:12:28 +02:00
PsiOmega
0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00
PsiOmega
ebc58b08d9 Power monitor UI now attempts to get the turf of its host. 
get_turf() gets upset when attempting to get the loc of the power monitor itself, now being a datum.
 2015-06-09 16:24:47 +02:00
Zuhayr
73146a62fe Merge pull request #9747 from PsiOmegaDelta/150608-NanoPaths 
NanoUI sources can now be datums instead of atom/movable.
 2015-06-09 20:08:02 +09:30
PsiOmegaDelta
20542bf84b NanoUI sources can now be datums instead of atom/movable. 
Also accidentally fixes #7042 as the AI no longer cares about the machinery var.
 2015-06-08 17:06:06 +02:00
PsiOmegaDelta
cad9b59c25 AI restrictions and rejuvenation. 
Ensures the AI cannot use Topics() while unpowered.
Ensures the AI is properly rejuvenated by the AI verb, as a functional AI will now never be lying down.
 2015-06-08 09:10:33 +02:00
PsiOmegaDelta
3f26eeac99 Allows all synths to view the alternative law sets. 
This does not include laws such as the syndicate, spider clan, etc. laws.
Makes it less of a headache for a synth to state the standard NT laws while subverted, etc.
 2015-06-02 14:48:08 +02:00
Zuhayr
6e1d39ba2e Merge pull request #9554 from GinjaNinja32/nano_template 
Fixes #6077
 2015-05-30 02:16:32 +09:30
GinjaNinja32
8ed2380cee Fixes #6077 
Updates nanomanager's handling of opening UIs so that it can be called multiple times, changes force_open to simply ignore that the UI is open and try to open it again. Causes a slight flicker if the UI is open, but the window does not move or change size.
 2015-05-28 22:55:46 +01:00
PsiOmega
c21a456379 Fixes #9447. 
The inteliCard now has a NanoUI interface, allowing it to utilize custom CanUseTopic() checks depending on context, in-hand or in-rig.
 2015-05-24 11:33:54 +02:00
Mloc
cfb51cf198 better nanoui caching + fixes 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-14 22:35:50 +01:00
Zuhayr
6e003e6d99 Merge pull request #9134 from PsiOmegaDelta/UngrabRuntime 
Grabs no longer endless loop runtime.
 2015-05-10 23:20:56 +09:30
PsiOmega
fff5ea7840 Grabs no longer endless loop runtime. 2015-05-10 12:11:52 +02:00
PsiOmega
b98461c2af Station alarm monitor changes. 
Replaces a couple of station alarm monitors with variants that display all alerts; fire, atmospherics, power, camera and motion rather than just the first 3.
Adds a basic station alarm monitor on the engineering outpost.
 2015-05-08 11:22:29 +02:00
Chinsky
34bbe33030 Merge pull request #8993 from PsiOmegaDelta/PortableNanoUI 
Portable atmospheric pump/scrubbers now use NanoUI.
 2015-04-29 09:43:47 +03:00
mwerezak
290a7d5000 Fixes #8536 
Also removes a bunch of redundant comments
 2015-04-27 01:11:40 -04:00
PsiOmega
952cdda4e6 Merge remote-tracking branch 'upstream/dev' into PortableNanoUI 
Conflicts:
	baystation12.dme
 2015-04-26 19:40:05 +02:00
PsiOmega
e2ce3d1e01 Scrubber NanoUI interface. 
Ports https://github.com/d3athrow/vgstation13/pull/4142 with added Bay-flavor.
To operate once must be adjacent to the scrubber.
Silicons can view the status panel from any distance they are able to access the scrubber from.
This preserves the current behavior.
 2015-04-26 17:34:56 +02:00
PsiOmega
fe09ed1a22 Merge remote-tracking branch 'upstream/dev' into BorgModules 
Conflicts:
	code/game/objects/items/robot/robot_upgrades.dm
	code/modules/mob/living/silicon/ai/subsystems.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_upgrades.dm
 2015-04-26 15:52:18 +02:00
PsiOmega
9df5048dbc Makes it possible for borg modules to include specific subystems. 2015-04-26 15:42:36 +02:00
PsiOmegaDelta
7a27aece0d Merge pull request #8941 from Baystation12/master 
Dev
 2015-04-22 09:32:56 +02:00
PsiOmega
7f6b908af2 Fixes #8917. 
Makes it possible to scan for new sensors as necessary.
Useful if the ability to remove/change/create new sensors is added.
 2015-04-20 10:03:54 +02:00
PsiOmega
27abc7404d Gives AI a personal atmospherics control subsystem. 
Includes further work on NanoUI interactions.
 2015-04-19 00:24:19 +02:00
PsiOmega
67708c6d3b Fixes #8880. 
Case of incorrectly sent parameter.
 2015-04-18 08:59:49 +02:00
PsiOmega
aa5d5d5256 Fixes NanoUI interaction. 
A number of machinery objects were returning STATUS_INTERACTIVE instead of parent.
Fixes missing subtype definition for /var/global/datum/topic_state/default/default_state.
 2015-04-13 23:19:22 +02:00
GinjaNinja32
d4eb42b38b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/projectiles/targeting.dm
 2015-04-13 12:49:07 +01:00
PsiOmega
6458d91d83 Fixes AIs inside inteliCards being unable to interact with the world around it. 
Apparently being inside an object affects view() in unexpected ways.
 2015-04-12 14:04:00 +02:00
=
78987a436a Merge resolution. 2015-04-11 13:23:17 +09:30