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
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
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
Chinsky
a893baf8be
Merge pull request #6167 from PsiOmegaDelta/PDATime
...
PDA - Examination now offers station time
2014-08-27 01:32:47 +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
Ccomp5950
25506f33fa
Merge pull request #6032 from Walter0o/low_pressure_fix
...
fixes #6005 and broken ancient human low/high pressure code.
2014-08-19 05:54:30 -05:00
Whitellama
26721cf0d5
Fixed eggs not going back into egg boxes
2014-08-19 02:44:58 -07:00
Whitellama
7ced8104ca
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/game/objects/items/devices/transfer_valve.dm
2014-08-17 17:50:07 -07:00
Zuhayr
2033923f8f
Merge pull request #6018 from Hubblenaut/master
...
Patch of fixes for bugs and oversights
2014-08-18 09:28:17 +09:30
Whitellama
7539a6a5bb
Added a JMP button to logs when someone adds something to a transfer valve.
2014-08-17 16:06:07 -07:00
Walter0o
e8592d4f41
fixes #6005 and broken ancient human low/high pressure code.
...
-fixes low/high pressure not damaging unsealed/damaged spacesuits.
-refactors procs and adds more comments.
-removes unused/dead code.
2014-08-17 18:06:30 +02:00
Hubblenaut
15ae5ca2a9
Adds JMP button to certain admin logs
2014-08-17 02:21:21 +02:00
Walter0o
f5ca79d003
fixes building more than 1 grille per turf
...
rapidly triggering attack_self() enabled building more than 1 per turf,
which is fairly abusive and not indended.
2014-08-16 22:48:13 +02:00
Chinsky
e4847b729e
Merge pull request #5994 from GinjaNinja32/shards
...
Stepping in shrapnel fix and unification of shard code
2014-08-14 22:55:39 +04:00
Chinsky
07ed87ccd9
Merge pull request #5993 from GinjaNinja32/proximity2
...
More proximity fixes
2014-08-14 22:55:29 +04:00
GinjaNinja32
9b9b69f547
Use absolute paths
2014-08-14 11:20:07 +01:00
Zuhayr
43a7757252
Merge pull request #5982 from Jarcolr/customs
...
Adds the cigar case as a premium cigarette vending machine item.
2014-08-14 12:02:49 +09:30
Chinsky
af9f56f164
Merge pull request #5969 from GinjaNinja32/floortiles
...
Adds floor painter.
2014-08-14 06:31:09 +04:00
Hubblenaut
c80b921d6b
Logs finishing tank transfer valve bombs and ghosting. Changes pAI request
...
to state the name of the inquirer.
2014-08-14 01:07:09 +02:00
GinjaNinja32
539392c14e
Use \the macro
2014-08-13 21:30:28 +01:00
GinjaNinja32
05e7c4a07a
Moved all shard code to one file. Fixed #5992
2014-08-13 21:05:27 +01:00
GinjaNinja32
d1fc12e1c7
More proximity fixes
2014-08-13 20:58:49 +01:00
Jarcolr
6c807199c9
Adds the cigar case as a premium vending item
...
5 may be a bit too much, but who is going to get all those coins,
anyway?
2014-08-13 12:10:43 +03:00
GinjaNinja32
b4e6b4e204
Fixes not checking proximity argument
2014-08-13 09:41:38 +01:00
GinjaNinja32
7b7f526903
Fixes being able to use the floor painter through windows, windoors etc.
2014-08-13 09:30:11 +01:00
GinjaNinja32
9abd6765b1
More floor tiles
2014-08-12 21:13:46 +01:00
GinjaNinja32
0493090f15
Add more floor tile types
2014-08-12 21:09:51 +01:00
GinjaNinja32
dcd5092f23
Add floor painter
2014-08-12 20:47:26 +01:00
Walter0o
7aa7f1c56c
getting rid of text macro
2014-08-12 02:24:37 +02:00
Walter0o
dd39fbe985
typo fix
2014-08-11 23:23:38 +02:00
Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
Chinsky
18070da974
Merge pull request #5922 from Jarcolr/customs
...
Complements the job specific satchels with 5 new job specific backpacks
2014-08-10 04:02:26 +04:00
Jarcolr
b4e9d9923f
Complements the satchels with backpacks
...
5 new backpacks: virologist, chemistry, geneticist, science,
hydroponics.
2014-08-08 22:20:11 +03:00
Chinsky
9f9865dac4
Merge pull request #5619 from mwerezak/power-net
...
ATMOSPHERICS and Power Net Overhaul
2014-08-08 09:49:42 +04:00
Zuhayr
aa90ebb0c6
Merge pull request #5903 from Ccomp5950/mouse-trap-tag-fix
...
Fixed the font tag on mouse traps description.
2014-08-07 10:01:23 +09:30
Ccomp5950
74fd47e2de
Fixed the font tag on mouse traps description.
2014-08-05 18:55:15 -05:00
Ccomp5950
52da372bac
Fueltanks now log and admin_msg when shot at / weldered
2014-08-04 21:11:09 -05:00
