LBraindead
9e752d7c79
Update Fire.dm
...
a bit of rebalancing that should fix the eternal-fire bug
2014-01-01 23:19:27 +01:00
Zuhayr
56c967c250
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2013-12-31 21:24:03 +10:30
Zuhayr
da654c80d0
Binary merge conflict, agh. Manual merge incoming.
2013-12-31 21:16:20 +10:30
DJSnapshot
7a7eca4393
Merge pull request #4146 from Baystation12/dev-freeze
...
Dev-freeze --> Master staging [Going live!]
2013-12-30 13:52:21 -08:00
Zuhayr
df6bd5d6c8
Gib rewrite/resprite to allow for arbitrary blood and flesh colours.
2013-12-30 21:48:34 +10:30
Zuhayr
f20a843496
Merge pull request #4142 from Ccomp5950/pda_optimizations
...
Optimizations of PDA NanoUI
2013-12-29 16:06:29 -08:00
Zuhayr
53c94f76bd
Merge pull request #4134 from comma/gunlocker
...
Adds gun cabinets - special snowflake secure closets.
2013-12-29 06:25:12 -08:00
Chinsky
4ddf6ad4a1
Merge pull request #4140 from Zuhayr/dev
...
Adds ghost writing, config options, redid blood paths/xenoblood.
2013-12-29 05:54:27 -08:00
Chinsky
e63d5c14a5
BYOND cannot into chain assignment
2013-12-29 17:52:56 +04:00
Ccomp5950
f14c46cc9c
PDA NanoUI spam event update.
...
Since PDA's track conversations now we won't have a PDA for spam (we could always create a dummy object for it in the future)
So we don't want it adding to tnote. Popping up on the players chat is fine for now.
2013-12-28 20:56:06 -06:00
Ccomp5950
da140dd4bb
Optimizations of PDA NanoUI
...
We don't have to process every function every time, should shrink the JSON
data pushes as well as sanitize some of the data.
2013-12-28 19:38:14 -06:00
Zuhayr
154717aef6
Actually stopped gibs from being shaded without making their footprints pale.
2013-12-29 04:06:17 +10:30
Zuhayr
bf820a99b6
Fixed robot gib display issue, updated single path on map to new path.
2013-12-29 03:07:20 +10:30
Zuhayr
5313851da9
Converted robots over to current blood system/paths, updated various files to work with update.
2013-12-29 02:48:20 +10:30
Zuhayr
5d902525cf
Fixed up human and xeno blood procs, stopped gibs being shaded until we can rewrite them to work with blood colour.
2013-12-29 02:47:46 +10:30
Zuhayr
73a5efec2a
Fixed a gib display issue with robots.
2013-12-29 02:32:10 +10:30
Zuhayr
ca47918e4b
Actually fixed the blood writing runtime this time.
2013-12-29 01:12:47 +10:30
Zuhayr
be14eb8781
Minor hand blood overlay fix.
2013-12-29 00:34:03 +10:30
Ccomp5950
da4f884b46
PDA Nano-UI Fix.
...
Fixes the line breaks in notes so it doesn't piss of nanoUI when you have multiple lines.
Also fixed quotes, this will remove the ability to use less then and greater then in notes but not much I can do about that without
adding a bunch of replacetext procs encoding and decoding only those items.
2013-12-28 07:49:43 -06:00
Zuhayr
a17b37ec95
Runtime fix for blood lettering decal.
2013-12-29 00:12:53 +10:30
Zuhayr
01dd4373d0
Minor bugfix with blood painting code.
2013-12-29 00:11:21 +10:30
Zuhayr
46bf56f38a
Wrong var in ghost writer toggle.
2013-12-29 00:03:45 +10:30
Zuhayr
26de46ae4b
Added ghost writing proc to mob/dead.
2013-12-28 23:59:47 +10:30
Zuhayr
85ad2363c4
Added config toggle for ghost writing (for adminbus).
2013-12-28 23:53:20 +10:30
Zuhayr
df38d75131
Added config values for ghost writing.
2013-12-28 23:30:23 +10:30
Zuhayr
6888651da6
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2013-12-28 23:14:43 +10:30
Zuhayr
c6c1a575d6
Merge of blood file, ammo icons, map. Manual binary file merge incoming.
2013-12-28 23:13:04 +10:30
Zuhayr
ba018c84af
Typo.
2013-12-28 23:07:29 +10:30
Zuhayr
e9e5dd4ebe
Map merge resolution.
2013-12-28 23:05:23 +10:30
Zuhayr
9f98909ce8
Nuke starting condition rebalance, op number scaling rebalance.
2013-12-28 23:00:42 +10:30
Chinsky
3f3ae1fad6
Rocket launchers shouldn't probably fit on belt
2013-12-28 16:25:49 +04:00
DJSnapshot
eeeae3d285
fixes because Sue is silly.
2013-12-27 20:23:44 -08:00
DJSnapshot
1f5e278aa6
Added Sue's new weapon code and sprites.
2013-12-27 16:44:44 -08:00
Mloc
1967a17715
Merge pull request #4126 from Zuhayr/dev-freeze
...
Removal of corgi dressup, uncommenting of ninja block in Check Antags.
2013-12-27 06:59:14 -08:00
Zuhayr
6f186d6bac
Possible fix for href exploit in uplinks, unable to test locally.
2013-12-27 18:12:46 +10:30
Zuhayr
20b6e6fecf
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-12-27 17:48:41 +10:30
Chinsky
2de31e29be
Merge pull request #4128 from SkyMarshal/patch-5
...
Hypothetically adds proximity check to droppers.
2013-12-26 22:10:22 -08:00
Chinsky
92f169a72c
Merge pull request #4124 from DJSnapshot/hotfix
...
Nerf to shield blobs
2013-12-26 22:09:06 -08:00
SkyMarshal
30970b7b56
Hypothetically adds proximity check to droppers.
...
This code is awful, but it appears "flag" (who names this shit?) acts as a proximity check.
2013-12-26 21:22:00 -07:00
Zuhayr
183afc61bf
Reverts corgi dress-up due to being terrible and duplicating items.
2013-12-27 11:06:20 +10:30
DJSnapshot
4f4e9bb000
Fix for the nuke disarm menu not showing up.
2013-12-26 16:27:05 -08:00
Zuhayr
b638388bdd
Uncommented ninja block in Check Antags.
2013-12-27 10:48:37 +10:30
Zuhayr
661593718f
Using dev-freeze map.
2013-12-27 10:42:13 +10:30
DJSnapshot
efdeea5bab
Nerf to shield blobs.
...
Now they take 2 hits instead of 3, that way they are a little easier to deal with and hopefully not as much meta will have to occur.
2013-12-26 13:20:38 -08:00
Chinsky
5068a54568
Adds update_icon to drips
2013-12-26 18:39:29 +04:00
Chinsky
d920a4651f
Fixed rainblowd
2013-12-26 18:16:29 +04:00
Chinsky
a097c235ed
Made tracks use colors instead of icon procs too.
2013-12-26 18:12:01 +04:00
Chinsky
25bb796b7f
Added some sanity to brightness proc
2013-12-26 17:18:17 +04:00
Chinsky
38a8b58ec8
Replaced weird ass space indenetation with tabs in tracks.dm
2013-12-26 16:27:09 +04:00
Chinsky
ff89532402
Sets right color for shoes overlay when stepping in blood.
2013-12-26 16:21:17 +04:00
