Commit Graph

17479 Commits

Author SHA1 Message Date
Zuhayr
9f6c22d437 Reapplies LightningIron's fix for #6131 2014-09-02 10:02:37 +09:30
Zuhayr
e2120f9f27 Merge pull request #6249 from JimTheCactus/pda_monitor_upgrade
[DEV] PDA Power Monitor Clarity Upgrade
2014-09-02 09:42:52 +09:30
Zuhayr
643c60d0a6 Merge pull request #6237 from PsiOmegaDelta/NewAreas
Re-arranges areas - Stage 1
2014-09-02 09:41:15 +09:30
Zuhayr
08df83fc3d Merge pull request #6243 from Whitellama/bugfixes
Fixes tank dispenser sprites not updating, fixes combat belts not holding police tape, other bugfixes
2014-09-02 09:39:17 +09:30
Zuhayr
0129ec81d0 Merge pull request #6252 from DeeUnderscore/pencode-headings
Add headings to pencode
2014-09-02 09:37:53 +09:30
Zuhayr
61d2c7f1d6 Fixed a comment in cryofreezer code. 2014-09-02 09:28:24 +09:30
Zuhayr
e33280090c Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev 2014-09-02 09:24:22 +09:30
Zuhayr
53bee60a27 Merge resolution. 2014-09-02 09:18:20 +09:30
Zuhayr
6faad805d8 Merge pull request #6244 from JimTheCactus/LibraryFix
Fixes sanitizeSQL proc
2014-09-02 00:23:52 +09:30
Zuhayr
58a750398e Fixes 5866# 2014-09-01 23:20:46 +09:30
Zuhayr
aedb3725f2 Fixes #5874 2014-09-01 23:20:27 +09:30
Zuhayr
066772b1ce Fixes #5879 2014-09-01 22:45:37 +09:30
Zuhayr
ad2cf64c7b Fixes #6119 2014-09-01 22:41:15 +09:30
Zuhayr
ad15b7e2c1 Fixes #6137 2014-09-01 22:27:44 +09:30
PsiOmega
9e4b7ed265 Preliminary support for the new general information. Renames the exploit record to permanent record.
The new general information being:
Home system
Citizenship
Faction
Religion

Still to be made available in employment/security/medical records as applicable.
2014-09-01 14:45:47 +02:00
Zuhayr
74d9b1bf2d Fixes #6178 2014-09-01 22:15:45 +09:30
PsiOmega
3c0f527c1c Merge remote-tracking branch 'upstream/dev' into NewAreas 2014-09-01 14:39:48 +02:00
Zuhayr
bf462d21b1 Fixes #6198 2014-09-01 22:08:56 +09:30
Chinsky
4e281fde44 Merge pull request #6231 from mwerezak/entropy-fix
Fixes #6229
2014-09-01 16:35:23 +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
JimTheCactus
b54a3056c7 Improved PDA power monitor for clarity
The PowerON cart will now display the area that the power monitor is located to make it clear that you're looking at the power monitor, not the actual power net. This comes up when multiple power monitors have the same name.
2014-09-01 01:32:30 -06:00
JimTheCactus
aeea0b0bd6 PDAs now behave properly with unconnected power monitors
Resolves an issue where the PDA would throw a runtime and a client side error when attempting to communicate with a power monitor that wasn't connected to a power net.
2014-09-01 01:27:54 -06:00
JimTheCactus
eaa641adbd Fixes sanitizeSQL proc
Resolved an issue where an extra character was being removed.
2014-08-31 21:28:24 -06:00
Whitellama
9cd42a3f33 Changes candle.dm procs to absolute paths 2014-08-31 19:48:34 -07:00
Zuhayr
e2a7bd897b Merge pull request #6228 from PsiOmegaDelta/LockerCapacity
Limited locker capacity
2014-09-01 12:17:07 +09:30
Whitellama
bdce104b6d Improved anomaly chat message cooldowns. 2014-08-31 17:51:13 -07:00
Whitellama
98e287bc6d Fixed xenobiologist having no preview clothes in character setup 2014-08-31 16:22:43 -07:00
PsiOmega
dccec4483d Syndicate agents can now view exploitable information from their syndicate uplink display. 2014-09-01 01:12:03 +02:00
Whitellama
d536f7d56a Fixed police tape not going in tactical combat belts 2014-08-31 15:34:21 -07:00
Whitellama
dae602a2ec Fixes tank dispenser sprite not updating icons when a tank is added 2014-08-31 15:22:13 -07:00
PsiOmega
89b29eb0f0 One can now save exploitable information about the character, potentially to be used by antags. 2014-08-31 21:31:10 +02:00
D Anzorge
9d76b55eb7 Add headings to pencode
Allows for h1 through h3 use in pen-written text.
2014-08-31 09:46:45 -04:00
PsiOmega
208cd8d1cc Re-arranges areas
Less emergency shutters dropping due to alarms in adjacent but connected rooms. Primarily affects security.
Main hallways are now less jagged, making fire alarm/emergency shuttle flashing look better.
Replaces the chief engineer/head of security areas with the existing crew_quarter variants as these are rad-storm protected (and are likely to contain SSD crew).
2014-08-31 11:49:56 +02:00
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
Whitellama
628f56ce42 Nerfed celldrain/charge to a limited range and stopped anomaly effects from spamming synthetics 2014-08-31 01:48:52 -07:00
Ccomp5950
9952f47677 Merge branch 'engineering-substations' of https://github.com/atlantiscze/Baystation12 into atlantiscze-engineering-substations 2014-08-30 21:57:48 -05:00
Ccomp5950
907dc43568 Merge pull request #6220 from mwerezak/gas-entropy
Engine Atmos Control Console
2014-08-30 21:15:36 -05:00
Atlantiscze
975070c1ba ENGINEERING SUBSTATIONS!
- Mapped in engineering substations
- Completely reworked station wiring (Z level 1)
- Wire colours: Yellow - Local Power (engine, solars), Red - Main Grid, Green - Sub Grid (department grid)
- Adds breaker box variant that starts enabled
- Substation PSUs are now not set to charge themselves by default (as this caused quite large loads)
2014-08-31 03:52:38 +02:00
Atlantiscze
228fa21a46 Adds Fractal Energy Reactor
- Fractal energy reactor is infinite power source
- It is NOT mapped in. It is intended for map testing purposes when large amount of power is needed
- It is NOT buildable. Only way to obtain it is by spawning it.
- Outputted power can be varedited to your liking. Defaults to 2MW (should be enough for ... well, everything?)
2014-08-31 03:44:25 +02:00
MrSnapwalk
8551a81c2b Adds the Cybernetic Casings custom item. 2014-08-30 18:53:04 -05:00
mwerezak
762a1d1f03 Increased disposal flow rate and pump power 2014-08-30 16:19:19 -04:00
Atlantiscze
641098fe78 SMES (de)construction:
- Adds supply pack for SMES coil. Costs 75 points for single coil.
- Adds design for SMES circuitboard. Needs diamonds, gold, silver and is very high tech.
2014-08-30 22:03:37 +02:00
mwerezak
0a7b898253 Fixes #6229
Entropy was being divided by total_moles twice.
2014-08-30 15:49:35 -04:00
Atlantiscze
7bb01ca020 Breaker Box update
- Added suggestions by mwerezak and comma
- Directions list is now in variable
- Type changed to /obj/machinery/power/breakerbox
- Instead of using loop visible_message() is used now.
2014-08-30 20:54:41 +02:00
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
PsiOmega
bad2f92e1c Mobs now requires 15 units of storage in a locker to fit. Allows two mobs in a single typical locker. 2014-08-30 18:06:21 +02:00
Zuhayr
677470c24c Merge pull request #6216 from PsiOmegaDelta/ShowerCurtains
Shower curtains
2014-08-31 00:12:02 +09:30
Atlantiscze
cb52831268 SMES construction fix:
- You can no longer place coils into PSUs.
- SMES now properly checks max_coils var when installing new coils.
2014-08-30 16:21:03 +02:00