cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 10:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 7 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

715 Commits

Author SHA1 Message Date
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
PsiOmega
03a293d226 AI restoration console shows ion laws 
AI restoration console now displays ion laws just as the intelliCard does.
Fixes a minor problem with the intelliCard not adding newlines after ion laws.
 2014-09-20 10:42:41 +02:00
PsiOmega
b1051747eb Crew Monitor now displays the detailed list instead of map first 
Due to issues with Linux/Wine users.
 2014-09-13 22:10:15 +02:00
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
 2014-09-10 22:14:37 +01:00
mwerezak
ee56453ca3 Allows heater/freezer construction dir to be set 2014-09-07 17:07:53 -04:00
Kelenius
505f857eb8 Stack update 2014-09-02 09:59:32 +04:00
Chinsky
8a8f1ce7e1 Merge pull request #6227 from mwerezak/camera 
Camera Fixes
 2014-09-01 16:35:19 +04:00
Zuhayr
059532c155 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-09-01 22:03:29 +09:30
mwerezak
cfc20ffe7b Fixes silicon mobs bypassing can_use() check 2014-08-30 13:44:37 -04:00
mwerezak
630a722ce3 Fixes being able to look through disabled cameras 
check_eye() was checking status instead of can_use().
 2014-08-30 13:10:17 -04:00
mwerezak
b381d46556 Adds engine core atmos control 
Expands on the earlier engine pump fix to add proper control over the
engine core atmos. Adds core control computer that can set output
external pressure bound instead of output pressure, and special high
power vent pump type for the engine core.
 2014-08-29 14:10:43 -04:00
Zuhayr
25573c17c6 Merge pull request #6185 from comma/holodeck 
Cleaned up holodeck controller a little.
 2014-08-28 11:10:41 +09:30
Walter0o
c0b6f82ad0 emergency HTML/JS injection fix MK2, the underping. 
fixes a minor oversight in proc order after i shuffled them around.
 2014-08-27 15:42:59 +02:00
Walter0o
89d2c956ca emergency HTML/JS injection fix. 
sanitation of status display input was missing everywhere.
 2014-08-27 14:42:58 +02:00
Chinsky
8b889774ee Cleaned up holodeck controller a little. 
Now it uses global list of holdeck programs available instead of hardcoding them into interface.
Console can be set to have only some of those programs.
 2014-08-27 03:39:31 +04:00
PsiOmega
a1dd07db38 Merge remote-tracking branch 'upstream/dev' into StatusDisplay 
conflicts:
	maps/tgstation2.dmm
 2014-08-26 14:21:29 +02:00
PsiOmega
a3b683d10f Merge remote-tracking branch 'upstream/dev' into StatusDisplay. Moved code in New() into initialize(). 2014-08-26 00:03:18 +02:00
PsiOmega
9eef5ff877 Status displays can now show station time. Also prepares for making brig timer inherit from status display. 2014-08-25 19:30:56 +02:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
PsiOmega
ad387fda96 One can now update crew record photos using a security console. 2014-08-22 19:39:35 +02:00
Chinsky
871456f131 Merge pull request #6084 from PsiOmegaDelta/MoreNounce 
Announcement Refactoring
 2014-08-21 21:53:03 +04:00
PsiOmega
68bf885e6b Announcement system refactoring. 
Turns announcements into a datum based system to allow a variety of configurations.
Current configuration options include:
Admin logging
Which sound that should play when announced, if any
If the announcement should be stored as a newscast

Request console/standard announcements currently match priority announcements, but have a smaller style/footprint.
Player announcements now include the assignment and name of the person (or the id rather) who made it.

Have currently only updated the request console and all announcements which previously used captain_announce().
Affected automated announcements, such as shuttle messages, should be exactly the same as before.
 2014-08-21 06:34:41 +02:00
Chinsky
fd486ea369 Merge pull request #6064 from PsiOmegaDelta/Announce 
AI Announcements & Verbs
 2014-08-21 01:37:55 +04:00
PsiOmega
a2253617cf Makes it possible for the AI to make station wide announcements. Improved AI verb handling in case of death/restoration. 2014-08-19 21:09:14 +02:00
mwerezak
c42d9171d6 Makes power monitor a power machine again 
Also moved the power monitor code to modules/power
 2014-08-19 01:45:23 -04:00
mwerezak
65bb47b7ec Setting computer vars on de/construction 2014-08-18 19:35:28 -04:00
mwerezak
52a6f2f9e0 Removes more unused vars from circuitboards 2014-08-18 18:28:39 -04:00
mwerezak
bdb2a45700 Makes power monitor computers actual computers 
Removes the powernet var from circuit boards. Power monitors get their
powernet from the cable underneath them anyways.
 2014-08-18 18:27:51 -04:00
PsiOmega
11ce777d9c Fixes #6027 
Creates two proper monitor circuits for Engineering/Mining.
Adds air alarms in the Research access foyer.
Relocates camera in Misc. research to a more central location.
Ensures there are enough Telecommunication Satellite SMES units to meet power demand.
 2014-08-18 22:37:54 +02:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
mwerezak
e1dc7d436b Fixes icons and other things not updating when the master controller updates power status. 
This was due to the master controller using update_powered_status()
instead of power_change(), but many machines override power_change() to
do various things when the machine gains or loses power.
 2014-08-10 03:45:20 -04:00
Walter0o
fa15a25b67 fixes #5934 2014-08-10 02:17:06 +02:00
Zuhayr
3e4c80e874 Merge pull request #5848 from JimTheCactus/computer3_text_field_fix 
DNA Field Fix and Field Validation
 2014-08-01 21:59:34 +09:30
Walter0o
7416d26197 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.
 2014-07-31 10:38:34 +02:00
JimTheCactus
19b032d8e8 Fixed bad reference to active 1 in the medical computer's DNA field inputs. 2014-07-30 01:09:26 -06:00
JimTheCactus
4d920bef59 Corrected variable edited field for blood dna. Was dna, not b_dna like it should be. 2014-07-29 23:19:29 -06:00
Mloc-Hibernia
a2dc7b827b Merge remote-tracking branch 'upstream/pr/5689' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/crew.dm
 2014-07-26 14:25:24 +00:00
Zuhayr
5da36d265e Merge resolution with PDA nanoui. 2014-07-25 22:57:53 +09:30
Ccomp5950
569e8361dc 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.
 2014-07-22 20:21:22 -05:00
Mark Aherne
3323a26300 Added PDA check in wear_id slot to get any potential id rank. 2014-07-19 03:38:50 +01:00
Mark Aherne
8396b76b83 Improved Crew Monitoring Console map. 
Added icons for use with map.
 2014-07-19 02:44:13 +01:00
Mark Aherne
f09b24ae17 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.).
 2014-07-19 00:31:28 +01:00
Zuhayr
f4ff51f146 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:32:00 +09:30
JimTheCactus
41904850d4 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
 2014-07-14 20:55:39 -06:00
Mark Aherne
7e7e6cd8ac Continued work in progress on a major revision of the NanoUI templating system. 2014-07-11 10:48:42 +01:00
PsiOmega
9b97420e97 The AI system integrity restorer no longer needs head AND captain access. 2014-07-04 00:12:41 +02:00
Zuhayr
04a6ea92db Adds Eject ID verbs to record computers. 2014-07-02 06:17:54 +09:30
Zuhayr
30385c2237 Fixes an access issue with the ID computer. 2014-06-30 08:48:51 +09:30
mwerezak
b8fb66380b Fixes escape shuttle not being callable from the communications console 2014-06-28 23:26:58 -04:00
mwerezak
25bcdfa39e Merge remote-tracking branch 'upstream/dev' into emergency-shuttle 
Conflicts:
	code/setup.dm
 2014-06-24 00:09:17 -04:00