Kilakk
4a10e9ce39
Merge remote-tracking branch 'upstream/dev' into dev
...
Conflicts:
code/game/gamemodes/nuclear/nuclear.dm
2014-01-01 11:51:53 -05:00
RKF45
86334cbee2
I have no idea what I'm doing D:
2014-01-01 17:03:02 +01:00
Zuhayr
37d96ebc80
Nerfs abandoned crates to be less fucking moronic.
2014-01-02 00:42:11 +10:30
Zuhayr
1cddbeb180
Fix for ninja being unable to wear full-sized oxytanks.
2014-01-01 22:10:25 +10:30
Zuhayr
f638f1db96
Prevented the ability to open locked crates with random items.
2014-01-01 21:33:23 +10:30
Zuhayr
b6af4a1b4e
Removes mime and HONK carts from protolathe.
2014-01-01 21:26:19 +10:30
Ccomp5950
c6c09954aa
Cleanbot runtime derp.
...
Set something to null then change a variable on it? Sure that won't runtime.
2014-01-01 02:55:08 -06:00
DJSnapshot
5085ee2561
Emergency fix for mods not loading.
2014-01-01 00:02:17 -08:00
DJSnapshot
b294174acb
Openable soda cans and beer bottles!
2013-12-31 17:52:12 -08:00
Chinsky
2cf4a9279c
Merge pull request #4157 from Ccomp5950/cleanbot_fix
...
Bugfix: Actually implement cleanbot targeting.
2013-12-31 17:33:14 -08:00
Ccomp5950
3448b24dad
Removed debug messages.
2013-12-31 18:06:39 -06:00
Ccomp5950
eb93d0a188
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into albino_clone_fix
2013-12-31 18:04:16 -06:00
Ccomp5950
36f81bd9b0
DNA2 clone fix. No longer albino with blue beards.
...
Looks like a copy paste problem where the eye blocks were being set to facial blocks
and the math needed for s_tone wasn't being done.
Todo: Fix clones not having unique_enzymes, /list being displayed in cloning pod, etc.
2013-12-31 18:02:48 -06: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
LightningIron
5007133848
Merge remote-tracking branch 'upstream/master'
2013-12-30 22:07:18 -06:00
Ccomp5950
645710cb0b
Bugfix: Actually implement cleanbot targeting.
...
Cleanbots won't attempt to clean up the same mess.
Also buffed how quickly they clean up dirt from 5 seconds to 2 seconds.
It was creating a blank list and then checking that list to see if anything else had
that mess targeted. Removed the blank list check and added an actual check.
2013-12-30 21:59:20 -06:00
Zuhayr
9d4d14f107
Fix for low oxy tank at ninja spawn.
2013-12-31 11:37:21 +10:30
Zuhayr
441b015186
Fix for absurd dirt levels.
2013-12-31 11:34:35 +10:30
Zuhayr
25f7db1949
Fix for unremovable dirty tiles.
2013-12-31 11:32:36 +10:30
Zuhayr
4c371a3d0b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-12-31 10:25:54 +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
Kilakk
c7f840de73
Fixes #4145 , nuke ops can choose their names on spawn-in
2013-12-30 15:38:02 -05:00
Zuhayr
5ca939fd39
Nuke starting condition rebalance, op number scaling rebalance.
2013-12-30 14:03:48 -05:00
Zuhayr
19c963ac73
Revised commit due to Mloc's suggestion.
2013-12-31 04:24:53 +10:30
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
