Zuhayr
cec617a414
Merge resolution, compile fixes with outdated glass paths/map.
2014-11-19 23:17:25 +10:30
PsiOmegaDelta
76aa84ee6e
Merge pull request #7058 from PsiOmegaDelta/BinaryTracking
...
Binary Tracking
2014-11-18 18:55:20 +01:00
Ccomp5950
61745c68c2
Merge pull request #7053 from DJSnapshot/adminfeatures
...
I forgot a thing
2014-11-18 09:30:33 -05:00
PsiOmega
f7bc35f333
Binary Tracking
...
The AI can again finally track entities using the binary channel.
2014-11-18 12:24:54 +01:00
PsiOmegaDelta
9b98d08d60
Merge pull request #7003 from mwerezak/window-fix
...
Fixes #6702 and cleanup
2014-11-18 08:15:47 +01:00
DJSnapshot
b078365f66
vote powers r 4 admons only
2014-11-17 15:18:22 -08:00
DJSnapshot
9d5ba587ac
Mentors don't need faxes, communications, or prayers.
2014-11-17 15:08:36 -08:00
Chinsky
ff665a2cb3
Merge pull request #7039 from Amunak/beaker-fix
...
Beaker fix
2014-11-18 01:58:56 +03:00
DJSnapshot
8c5639c720
sanity checks and other cleanliness things.
2014-11-17 14:35:24 -08:00
PsiOmega
e78a9c3efe
Merge remote-tracking branch 'upstream/dev' into Service
2014-11-17 12:00:01 +01:00
DJSnapshot
9c0ee5ad8a
speshul snoflake color for anyone with +everything in their admin_rank because it was requested by headmins.
2014-11-17 02:40:56 -08:00
DJSnapshot
0c84b32847
small sanity check.
2014-11-17 02:28:20 -08:00
DJSnapshot
e212b4170b
R_HOST is now a thing. Also allows gives headmins a global note remove.
2014-11-17 02:23:04 -08:00
DJSnapshot
abd3551754
headmin requested updates to adminhelps. Makes players select between three different types of help to narrow down what players are needing help for. That way mentors get only those relating to needing mentor help.
2014-11-17 01:30:21 -08:00
mwerezak
af8da7de03
Adjusts glass sheet construction menu input
2014-11-16 22:30:07 -05:00
Chinsky
ce3618a200
Merge pull request #6987 from MagmaRam/labcoat
...
Reworked labcoat buttoning
2014-11-17 04:17:16 +03:00
Chinsky
b3e2b20f91
Merge pull request #7023 from GinjaNinja32/borg_latejoin
...
Fix cyborg latejoining, allow mid-round joining, add robot cryo equivalent
2014-11-17 04:15:18 +03:00
Amunak
07b050435f
fixes redundant information for a custom beaker description
2014-11-16 20:34:12 +01:00
Amunak
4a845beb7d
corrects volume shown in description of beakers
2014-11-16 20:33:25 +01:00
PsiOmega
743d9be7d3
Merge remote-tracking branch 'upstream/dev' into Service
2014-11-16 10:34:42 +01:00
MagmaRam
4c5ae21aab
Fixed typo that broke everything
...
Haste makes waste and breaks everything. At least this time it was less
broken than last time.
2014-11-16 03:31:22 -05:00
MagmaRam
d01e14eb58
Revert "Revert "Changed defining of icon_open and icon_closed as requested""
...
This reverts commit 046c92419e
2014-11-16 03:24:39 -05:00
MagmaRam
046c92419e
Revert "Changed defining of icon_open and icon_closed as requested"
...
This reverts commit 8d34ffe397
2014-11-16 03:24:33 -05:00
MagmaRam
cdec94c5a8
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat
...
Conflicts:
code/modules/clothing/suits/labcoat.dm
This should hopefully fix all that conflict going on. Hopefully.
2014-11-16 02:56:32 -05:00
Zuhayr
b9a52a6c35
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-11-16 18:17:31 +10:30
Chinsky
d0d2a100bd
Merge pull request #7018 from GinjaNinja32/robot_move
...
Fixes cyborg movement depending on actuators when not caused by cyborg
2014-11-16 10:17:31 +03:00
Chinsky
599cb247bc
Merge pull request #7020 from MrSnapwalk/epsilon
...
Adds several custom items/cyborg sprites.
2014-11-16 10:17:25 +03:00
Chinsky
79d269c515
Merge pull request #7028 from PsiOmegaDelta/Portable
...
Portable Turret Fixes
2014-11-16 10:15:01 +03:00
Chinsky
8a13bfe0dd
Merge pull request #7030 from PsiOmegaDelta/AirAlarm
...
Silent Alarms
2014-11-16 10:14:36 +03:00
GinjaNinja32
51020f9e84
Merge branch 'dev' into borg_latejoin
2014-11-15 21:13:04 +00:00
MagmaRam
8d34ffe397
Changed defining of icon_open and icon_closed as requested
2014-11-15 14:36:10 -05:00
Chinsky
dd7e2d4874
Merge pull request #7019 from PsiOmegaDelta/MapFix
...
Map Fixes
2014-11-15 22:32:36 +03:00
GinjaNinja32
bc326280c1
Merge branch 'dev' into borg_latejoin
2014-11-15 18:54:20 +00:00
PsiOmega
c7e634a8a6
Merge remote-tracking branch 'upstream/dev' into Service
2014-11-15 19:32:35 +01:00
Chinsky
ba77ebc2c4
Merge pull request #7032 from PsiOmegaDelta/Scrubbers
...
Scrubber Icons
2014-11-15 21:28:02 +03:00
Menshin
cd1487f1fa
Rewrote maploader to act faster and better handle set variables.
...
Most notably :
* better loading times, less processing loops
* lists variables are now taken into account (simples and associatives)
* every character can now be used inside a string without fear of breaking the loading process
2014-11-15 01:33:13 +01:00
GinjaNinja32
95f0204332
Adds robot equivalent of cryo
2014-11-14 23:39:30 +00:00
GinjaNinja32
d10311befd
Adds cyborg-only latejoin spawnpoint
2014-11-14 23:38:09 +00:00
GinjaNinja32
a725526e4a
Fix cyborg latejoining, allow mid-round joining
2014-11-14 23:38:08 +00:00
PsiOmega
7ff2e4547b
Scrubber Icons
...
Gives online scrubbers a slightly more appropriate icon while viewed in the map.
2014-11-14 18:48:56 +01:00
PsiOmega
9096b74f54
Silent Alarms
...
Attempt to fix the issue where air alarms with disabled alarm reporting still notified the monitoring consoles.
2014-11-14 15:11:27 +01:00
PsiOmega
1e29289986
Dedicated Service Server
...
The service radio channel now has its own dedicated message log server on the telecommunication satellite.
As a bonus the telecommunication equipment room is now symmetrical.
2014-11-14 14:18:23 +01:00
PsiOmega
255b91553b
Merge remote-tracking branch 'upstream/dev' into PAP
...
Fixes #6844 .
2014-11-14 13:33:59 +01:00
PsiOmega
1140a709dd
Portable Turret Fixes
...
Constructed turrets begin offline.
(Un)wrenching turrets now take time.
If a turret has at least one controller then it cannot individually be turned on/off or set to lethal stun.
Uses the additional Topic-arg to make it possible for turret covers to call the actual turret Topic proc.
2014-11-14 13:25:57 +01:00
PsiOmega
0f620c9b56
Filled PAPs
...
There now exists pre-filled portable airpumps, mainly to be used by the ERT.
2014-11-14 09:26:39 +01:00
Chinsky
47b5dcfd86
Merge pull request #7016 from PsiOmegaDelta/SecRec
...
Relocates lasercolor snowflakes
2014-11-14 11:21:55 +03:00
Chinsky
0b8236da3b
Merge pull request #7017 from PsiOmegaDelta/SafeResearch
...
Research Safety
2014-11-14 11:21:47 +03:00
Chinsky
69ff886235
Merge pull request #7005 from mwerezak/door
...
Fixes door projectile damage
2014-11-14 11:21:30 +03:00
Chinsky
7261bcbd05
Merge pull request #6975 from Ccomp5950/restrict_ai_ert_shuttle
...
AI's no longer able to use specop's shuttle console.
2014-11-14 11:20:29 +03:00
Chinsky
2431c930d3
Merge pull request #7007 from mwerezak/helmet
...
Makes helmet icon south state consistent with east/west states
2014-11-14 11:19:29 +03:00
