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
Chinsky
92f169a72c
Merge pull request #4124 from DJSnapshot/hotfix
...
Nerf to shield blobs
2013-12-26 22:09:06 -08: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
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
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
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
Chinsky
57178dd251
Derp, forgot to change back from debug icon file
2013-12-26 15:36:25 +04:00
Chinsky
3ee2430425
Made blood overlays respect blood color
2013-12-26 15:28:03 +04:00
Chinsky
e5699fde0b
Readded dirtying floors.
2013-12-26 15:23:21 +04:00
Chinsky
a4e2756134
Made blood coloring use color var instead of icon operations.
...
Updated icons to match (they need to be white instead of black to work)
Updated some colors to look fine on them.
2013-12-26 14:07:18 +04:00
Chinsky
9d9d6de78d
Stopped robot chunks from drying up like meat ones. It's weird, and makes them pitch black.
2013-12-26 13:27:36 +04:00
Zuhayr
e89fe94af8
Merged binary files, adapted chinsky's blood painting procs to function with arbitrary colours.
2013-12-26 14:48:05 +10:30
Zuhayr
d97180239b
Using chinsky's blood file.
2013-12-26 13:46:12 +10:30
Zuhayr
1311cf0300
Merge pull request #4117 from comma/bloodydoodle
...
Adds ability to write on floors and walls with blood.
2013-12-25 19:13:30 -08:00
Zuhayr
1888a4d956
Merge pull request #4116 from comma/showoff
...
Adds Show item verb
2013-12-25 19:13:21 -08:00
Zuhayr
d9a0f496c0
Removed debug strings/values.
2013-12-26 10:35:45 +10:30
Zuhayr
5b6ec6cd12
Added arbitrarily coloured blood decals.
2013-12-26 10:29:42 +10:30
Zuhayr
6b2bfbc38d
Species-based blood colour support code.
2013-12-26 03:21:46 +10:30
Zuhayr
00a1462ad5
Updated turf procs for new blood system.
2013-12-26 01:56:55 +10:30
Zuhayr
8b0f778a83
Mass updates to paths for blood decals.
2013-12-26 01:56:06 +10:30
Zuhayr
80dc4f352f
Added blood colour var for /vg/ blood system.
2013-12-26 01:47:07 +10:30
Zuhayr
2e0ff4cd87
Converting existing objects over to /vg/station blood setup.
2013-12-26 01:46:39 +10:30
Chinsky
716a901858
Made ash dirty floors
2013-12-25 15:10:10 +03:00
Chinsky
d166d3c992
Merge pull request #4100 from Zuhayr/dev
...
DNA2 EPISODE 2: Revenge of the Bugs
2013-12-25 03:49:58 -08:00
Zuhayr
7dfbcdae68
Switched some if(mutation) to if(sdisability)
2013-12-25 22:14:31 +10:30
Zuhayr
61e2a1c9b8
Merge pull request #4097 from Ccomp5950/nanoUI_pda
...
NANOUI PDA
2013-12-25 03:40:24 -08:00
Chinsky
022fdf1e19
Merge branch 'master' of https://github.com/comma/Baystation12
2013-12-25 02:47:26 +04:00
Chinsky
ab727aef11
Added link to examine shown item.
...
Removed grab handler because it's an abstract item.
2013-12-25 02:44:42 +04:00
Chinsky
0b670f611d
Makes ash disappear on attack_hand to solve issue where paper burned inside containers would create immovable pile of ash.
...
I could swear that's how ash behaved at some point, but then again, I am drunk
2013-12-25 00:58:20 +04:00
Chinsky
ac1c24f35c
Adds ability to write on floors and walls with blood.
...
Codersprites for now.
2013-12-25 00:11:50 +04:00
Chinsky
e3e569593d
Fixed dried blood showin up as 'dried the blood'
2013-12-24 18:47:06 +03:00
Chinsky
4cb94fbf50
Small pefomance boost for drying blood.
...
Now using colors instead of icon procs.
2013-12-24 09:33:00 +03:00
Chinsky
ddcc5386eb
Adds verb similar to ID showing capability for quick showing item in active hand.
2013-12-24 09:49:23 +04:00
Chinsky
bca1aa5bd4
Merge pull request #4096 from fauxki/dev
...
RD Closet Changes
2013-12-23 04:39:46 -08:00
Zuhayr
72727e58d5
Forgot a tilde.
2013-12-23 11:18:00 +10:30
Zuhayr
28df8b73b2
Added deactivate() for midget power.
2013-12-23 11:15:29 +10:30
Zuhayr
cc1c1e2973
Changed disability removal to bitmask operators rather than -= as per Chinsky's posts in the diff.
2013-12-23 10:36:36 +10:30
Ccomp5950
8e518cb4a9
Vending Machine PIN fix.
...
Removed requirement for PIN on vending machines with an easy way of adding it back in the future
or setting machines to not use it or use it depending on what we decide later on.
Someone attempted to make it where it would accept any PIN and this is just as annoying as typing in a PIN.
So...space communism, swipe your card and it spits out an item. No PIN prompt at all.
2013-12-22 16:40:11 -06:00
Chinsky
94e94dfa5d
Adds gun cabinets - special snowflake secure closets.
...
Specialness is that icon of closed cabinet depends on if there are guns in it, and their type.
2013-12-22 23:10:22 +04:00
Ccomp5950
fb78caf9a5
Fixes Power Grid checks killing the AI's SMES.
...
Added the turrent protected check to restore_power() that is already in power_failure()
2013-12-22 08:38:26 -06:00
Zuhayr
ff52920fab
DNA2 fixes cherrypicked from N3X15.
2013-12-23 00:06:56 +10:30
Mloc
cd9c933111
Merge pull request #4088 from comma/signs
...
Adds signs pointing where department is.
2013-12-22 05:32:07 -08:00
Zuhayr
197d4993cf
Merge pull request #4087 from comma/nostalgy
...
Revisiting my first commits.
2013-12-22 05:28:35 -08:00
Ccomp5950
befb623417
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into nanoUI_pda
2013-12-22 07:01:15 -06:00
Zuhayr
d783fd5043
Manual binary merge of head icons.
2013-12-22 23:23:25 +10:30
