Chinsky
2cf5af181f
Merge pull request #6318 from PsiOmegaDelta/EyeOfTheNinja
...
Ninja-night vision now works.
2014-09-13 03:53:07 +04:00
PsiOmega
34346cf308
Ninja-night vision now works.
...
A ninja now uses proper glasses instead of using its own hack.
Fixed a bug that would override the old ninja-night vision unless one also wore additional glasses in the glasses-inventory slot.
Adds overlays to thermals and mesons as well. Slightly reduces the intensity of the night vision overlay.
2014-09-11 13:43:13 +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
Chinsky
0167be6920
Merge pull request #6275 from RavingManiac/dev
...
NewPipe
2014-09-09 17:54:53 +04:00
Zuhayr
29e59ff456
Merge pull request #6289 from comma/overmap
...
Overmap
2014-09-08 11:21:37 +09:30
Zuhayr
b4a254fe36
Merge pull request #6296 from GinjaNinja32/multiz-fixes3
...
Multiz fixes and mapping features
2014-09-08 11:20:34 +09:30
Zuhayr
cfd5801172
Merge pull request #6295 from DeeUnderscore/grape-grinder
...
Add grape juicing to reagent grinder
2014-09-08 11:20:16 +09:30
Chinsky
9e5525ba43
Merge pull request #6284 from Kelenius/OfTilesAndTiming
...
Fixes floor tiles
2014-09-07 21:23:40 +04:00
D Anzorge
697d8d5b35
Add grape juicing to reagent grinder
2014-09-07 10:36:43 -04:00
GinjaNinja32
b9f596a126
Multiz fixes and mapping features take 3
2014-09-07 15:32:36 +01:00
SparklySheep
fda0070273
Update candle.dm
2014-09-06 15:06:55 -05:00
SparklySheep
81b7327bbb
Increases how long the candle lasts.
...
Candle should last about ten times longer making it more useful as a light source.
2014-09-06 15:05:09 -05:00
Kelenius
b761ff5fcf
Fixes floor tiles
...
Laugh.
2014-09-06 21:34:00 +04:00
Chinsky
91daf249ff
Merge pull request #6278 from PsiOmegaDelta/StopRunningInTheShower
...
Wet shower floors
2014-09-06 05:43:17 +04:00
Chinsky
0f934f61c7
Merge pull request #6277 from PsiOmegaDelta/SayNoToUnderwear
...
Crew members are no longer cloned with clothes.
2014-09-06 05:43:10 +04:00
Zuhayr
2d06a04fac
Merge pull request #6280 from PsiOmegaDelta/RoundEndFixes
...
Round-end feedback fix
2014-09-06 11:09:35 +09:30
RavingManiac
1f5ee94096
Supply/scrubber upward pipes, downward pipes and pipe caps added.
2014-09-06 01:22:03 +08:00
PsiOmega
497eae1877
Human (and sub-races) are no longer cloned with clothes.
2014-09-05 16:04:02 +02:00
PsiOmega
98bc0d5f60
Fixes a bug where people who were in the lobby but not observers were considered non-survivors in shift-end feedback.
2014-09-05 11:00:47 +02:00
RavingManiac
ac8562c7d9
Map altered to be NewPipe-compatible
...
Removed calls for non-existent files
2014-09-05 01:50:14 +08:00
RavingManiac
4f4bb49f45
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-09-05 00:27:58 +08:00
RavingManiac
9801dfa9a9
NewPipe
...
-Supply and scrubber pipes can be run in parallel without connecting to each other
-Supply pipes will only connect to supply pipes, vents and Universal Pipe Adapters(UPAs)
-Scrubber pipes will only connect to scrubber pipes, scrubbers and UPAs
-Supply and scrubber pipes are offset along the x and y axes to prevent sprite overlap
-UPAs will connect to regular, scrubber and supply pipes, as well as anything else that connects to a regular pipe. UPAs will be used to interface between the supply/scrubber loops and atmos
2014-09-05 00:18:33 +08:00
PsiOmega
264504c595
Showers now cause wet floors. Mops can now be used to clean shuttles (non-simulated floor).
2014-09-04 16:36:26 +02:00
PsiOmega
4b4c2d11fa
Beepsky and ED209 are now closer friends than ever, now actually sharing code instead of each having gone and bought their own.
...
There is potential for breaking out all the special stuff for laser code but for now I'm happy to simply have a shared codebase.
I imagine pathfinding/patrolling may be sharable with bots in general as well.
2014-09-04 12:38:51 +02:00
Ccomp5950
7a228c9677
Merge pull request #6266 from PsiOmegaDelta/WhoYouGonnaCall
...
Sec/medical HUD users now receive relevant broadcasts
2014-09-04 04:16:55 -05:00
Ccomp5950
475074ed2f
Merge pull request #6265 from PsiOmegaDelta/CryoBags
...
Limits body/cryo bags to a single mob.
2014-09-04 04:15:08 -05: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
55ee64e764
Merge pull request #6211 from comma/tape
...
Tape now does not stop anything like magical wall it used to be.
2014-09-03 12:06:27 +09:30
Zuhayr
0344b33467
Merge pull request #6255 from PsiOmegaDelta/AreasStage2
...
Re-arranges Areas - Stage 2
2014-09-03 00:32:02 +09:30
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
Zuhayr
68b587b95f
Merge pull request #6116 from Hubblenaut/dev
...
Hazardly low pressure induces OxyLoss up to 55 points
2014-09-02 14:36:27 +09:30
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
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
6faad805d8
Merge pull request #6244 from JimTheCactus/LibraryFix
...
Fixes sanitizeSQL proc
2014-09-02 00:23:52 +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
PsiOmega
3c0f527c1c
Merge remote-tracking branch 'upstream/dev' into NewAreas
2014-09-01 14:39:48 +02:00
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
