Commit Graph

6854 Commits

Author SHA1 Message Date
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
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
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
be14eb8781 Minor hand blood overlay fix. 2013-12-29 00:34:03 +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
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
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
Zuhayr
20b6e6fecf Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-12-27 17:48:41 +10:30
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
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
Chinsky
5068a54568 Adds update_icon to drips 2013-12-26 18:39:29 +04:00
Chinsky
3ee2430425 Made blood overlays respect blood color 2013-12-26 15:28:03 +04:00
Chinsky
5191cb4c6c Made drips use species blood too. 2013-12-26 14:12:28 +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
6b2bfbc38d Species-based blood colour support code. 2013-12-26 03:21:46 +10:30
Zuhayr
8b0f778a83 Mass updates to paths for blood decals. 2013-12-26 01:56:06 +10:30
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
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
Chinsky
0c94d2892d Fixes #4071
Emote needed "me" action first, using custom_emote instead.
2013-12-25 14:44:50 +04:00
Chinsky
5071ea57ad Fix for #3583
Hostile mobs now check adjacency before applying damage.
2013-12-25 14:20:56 +04:00
Chinsky
9202fda78a Fixes #4028
Makes invisimin make mob transparent instead of icon changes.
2013-12-25 12:54:15 +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
7d95a385f2 No messages from beyond the grave pls. 2013-12-25 01:59:35 +04:00
Chinsky
c45f10f02b Merge branch 'dev-freeze' of https://github.com/comma/Baystation12 into dev-freeze 2013-12-25 00:36:35 +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
ee6a18d94d Adds White UI to selectable UIs 2013-12-24 23:05:41 +03:00
Mloc
0ff0004250 Merge pull request #4112 from fauxki/dev
Sprite Bug Fixes
2013-12-23 15:36:02 -08:00
DJSnapshot
782acc97cf Merge pull request #4103 from LightningIron/dev
Removed R&D lockboxes.
2013-12-23 15:25:17 -08:00
fauxki
28340d01ab #4108 - mispelling was preventing it from showing up. 2013-12-23 14:53:46 -08:00
Chinsky
bca1aa5bd4 Merge pull request #4096 from fauxki/dev
RD Closet Changes
2013-12-23 04:39:46 -08:00
Chinsky
6630a046c9 Merge pull request #4095 from DJSnapshot/dev-freeze
Misc Fixes to guns
2013-12-23 04:38:44 -08:00
LightningIron
cb3e39c476 Removed R&D lockboxes. 2013-12-22 13:29:28 -06:00
Zuhayr
ff52920fab DNA2 fixes cherrypicked from N3X15. 2013-12-23 00:06:56 +10:30