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
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
Chinsky
91daf249ff
Merge pull request #6278 from PsiOmegaDelta/StopRunningInTheShower
...
Wet shower floors
2014-09-06 05:43:17 +04: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
PsiOmega
e4bffb2d76
Limits body/cryo bags to a single mob.
2014-09-03 10:43:04 +02:00
Zuhayr
67cb6e297e
Merge pull request #6254 from Kelenius/OfStacks
...
Of Stacks
2014-09-02 17:58:28 +09:30
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
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
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
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
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
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
Chinsky
4ceb7dbd55
Merge pull request #6215 from PsiOmegaDelta/SyndiPDA
...
Syndicate Uplink - string to datum
2014-08-29 15:42:38 +04:00
Chinsky
54297a6865
Ported forcesay from TG
...
Stun batons and brute attacks have a chance to interrupt whatever guy was saying and send out incomplete version of whatever he had in chatbar.
Credit to Petethegoat.
2014-08-29 15:25:57 +04:00
PsiOmega
7e74ae82f5
Updates the Syndicate uplink to use a more robust datum system, rather than the old way of parsing a giant string.
2014-08-29 12:48:12 +02:00
PsiOmega
ed28212d22
Adding shower curtains to the various station showers because.. well, it's nice.
2014-08-29 11:08:22 +02:00
Ccomp5950
97468655bd
Merge pull request #6205 from Kelenius/OfPortalsAndHands
...
Made portals clickable
2014-08-29 03:49:00 -05:00
Whitellama
b15c74acd0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-08-28 18:29:05 -07:00
Whitellama
aa0ab32a9c
Egg boxes and donut boxes can be constructed from cardboard
2014-08-28 18:27:51 -07:00
Chinsky
552d4ed6eb
Health analyzer now shows is limb is not meat.
2014-08-29 04:13:12 +04:00
Chinsky
4cc2bd4e3d
Sending PDA messages and talking in radio things now triggers autoaim.
...
With PDA messages it also gives visible message, for baddies without autoaim-capable guns to consider.
2014-08-29 04:12:14 +04:00
Kelenius
285da89464
Made portals clickable
2014-08-28 22:04:20 +04:00
Zuhayr
6c9f60349b
Merge pull request #6183 from comma/curtains
...
Added curatins.
2014-08-28 11:09:36 +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
Zuhayr
cf68ad7c87
Master to dev merge.
2014-08-27 20:24:07 +09:30
Chinsky
2fe167c453
Added curatins.
...
Opaque non-dense structures.
2014-08-27 02:38:36 +04:00
Chinsky
a893baf8be
Merge pull request #6167 from PsiOmegaDelta/PDATime
...
PDA - Examination now offers station time
2014-08-27 01:32:47 +04:00
mwerezak
9859fc0b00
Fixes #6118
2014-08-25 21:02:57 -04:00
Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
PsiOmega
2c0bb7832d
Examining your own or a very close by PDA now reveals the current station time.
2014-08-25 12:34:25 +02:00
MrSnapwalk
195805636b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ertv3
2014-08-21 11:40:35 -05:00
Zuhayr
ee499426ad
Compile fixes.
2014-08-21 12:19:10 +09:30
Zuhayr
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
MrSnapwalk
9b464d268c
ERT update 3: electric boogaloo.
2014-08-19 21:46:27 -05:00
Ccomp5950
264aee843f
Merge pull request #6063 from Whitellama/master
...
Fixed eggs not going back into egg boxes
2014-08-19 06:23:57 -05:00
