Commit Graph

11966 Commits

Author SHA1 Message Date
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
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
5191cb4c6c Made drips use species blood too. 2013-12-26 14:12:28 +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
Chinsky
1c4c2d32a5 Added helper proc that adjusts brightness of given html color 2013-12-26 12:59:09 +04:00
Chinsky
e15d77eba7 Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into rainbowlood 2013-12-26 11:11:06 +04:00
Chinsky
82700e9eda Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-12-26 11:10: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
3a0448c2e4 Added num2dir() proc required by /vg/ blood setup. 2013-12-26 01:56:30 +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
Zuhayr
4746a3ada9 Merge pull request #4120 from Miniature/master
Added leaving prints on APCs when using item on them
2013-12-25 03:52:04 -08: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
Miniature
3d6f8ee4b2 Added leaving prints on APCs when using item on them
(fix issue #4109)
2013-12-25 22:11:13 +10:30
Zuhayr
61e2a1c9b8 Merge pull request #4097 from Ccomp5950/nanoUI_pda
NANOUI PDA
2013-12-25 03:40:24 -08:00
Zuhayr
2777761cef Merge pull request #4093 from comma/guestpass
Guestpass
2013-12-25 03:39:50 -08:00
Chinsky
0c94d2892d Fixes #4071
Emote needed "me" action first, using custom_emote instead.
2013-12-25 14:44:50 +04:00