Commit Graph

8480 Commits

Author SHA1 Message Date
igalan
43159538bc Fixes the HE straight pipes into bent ones travesty. 2014-09-04 07:13:16 +01:00
igalan
fb364eb57d Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dfreeze_pipe_dupe_fix 2014-09-03 23:51:22 +01:00
igalan
6bf6eaeb60 Fixes pipes duplication issues 2014-09-03 23:48:30 +01:00
PsiOmega
65bb6f8be1 Entities wearing sec/medical HUDs or corresponding now receive broadcast messages from relevant bots. 2014-09-03 18:50:46 +02:00
PsiOmega
e4bffb2d76 Limits body/cryo bags to a single mob. 2014-09-03 10:43:04 +02:00
Zuhayr
0b6b3d8e0e Merge pull request #6253 from mwerezak/skrell
Hardsuit refitting sprite sheet
2014-09-03 12:06:18 +09:30
Zuhayr
0344b33467 Merge pull request #6255 from PsiOmegaDelta/AreasStage2
Re-arranges Areas - Stage 2
2014-09-03 00:32:02 +09:30
mwerezak
30464da6ef Allows refitting to change worn sprite 2014-09-02 08:31:16 -04:00
PsiOmega
dda1449404 Includes mwerezak's fore solar area changes. 2014-09-02 12:29:57 +02:00
Zuhayr
67cb6e297e Merge pull request #6254 from Kelenius/OfStacks
Of Stacks
2014-09-02 17:58:28 +09:30
PsiOmega
9cd5a1b1fe Maintenance Cleanup 2014-09-02 09:22:14 +02:00
Chinsky
367ddf6848 Merge pull request #6242 from PsiOmegaDelta/ExploitableAlternative
Antags - Exploitable Information - MKII
2014-09-02 11:18:50 +04:00
Kelenius
505f857eb8 Stack update 2014-09-02 09:59:32 +04:00
PsiOmega
b7d356c4ab The Syndicate uplink now only access the locked records, meaning it will be unaware of later in-round changes concerning a given character. 2014-09-02 07:12:13 +02:00
Whitellama
71c2317264 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame
Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
2014-09-01 18:31:26 -07:00
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
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
aedb3725f2 Fixes #5874 2014-09-01 23:20:27 +09:30
Zuhayr
066772b1ce Fixes #5879 2014-09-01 22:45:37 +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
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
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
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
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
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
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
mwerezak
07c8ebcff7 Fixes #6224 2014-08-30 09:58:10 -04:00
Ccomp5950
f6b2fbd32d Merge pull request #6210 from comma/nochatter
Sending PDA messages and talking in radio things now triggers autoaim.
2014-08-29 22:44:04 -05:00
Ccomp5950
48f7f08d64 Merge pull request #6209 from comma/ironscan
Health analyzer now shows is limb is not meat.
2014-08-29 22:43:37 -05:00
Ccomp5950
68f2833a3b Merge pull request #6208 from comma/forcesay
Ported forcesay from TG
2014-08-29 22:43:20 -05:00
mwerezak
8877e813a5 Cameras are upgraded with scanning_module
Cameras get xray when upgraded with a scanning_module that is advanced
or greater.
2014-08-29 18:26:57 -04:00
Atlantiscze
87cc0e509c Adds Substation related areas
- Adds areas for Substations
- Adds mapping icon for Substations.
2014-08-29 20:55:28 +02: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