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
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
Zuhayr
bda1297472
Merge branch 'master' of https://github.com/Zuhayr/Baystation12
2013-12-22 23:13:22 +10:30
Zuhayr
b9fcd34df3
Merged config and changelog.
2013-12-22 23:11:29 +10:30
Ccomp5950
ec7921909f
NANOUI PDA
...
Creates NanoUI for the PDA and Syndicate Uplink.
New features:
Crew manifest now sorted with department heads at the top.
Can select individual conversations and delete individual conversations among PDA's
Powernet Monitor much more simple now and easier to read.
Janitorial supplies locator now includes Janicart.
Items will actually refresh if you click "Refresh"
Some other changes:
Captain's PDA cartridge now has all access (added janitor access and quartermaster access)
With the conversation change I had to change how tnote (the variable that holds PDA messages works.
Setup the message server to use the new methods.
Removed procs that will no longer be used (UI generation procs from old UI methods)
Commented everything the best I can.
Created HORRIBLE, TERRIBLE lists. But it's pretty much required because that's how nanoUI rolls.
Created a variable on the uplink called NanoUI items, this list is created upon creation of the
uplink.
I included the functionality for Mimes and Clowns for our downstream servers that have those.
2013-12-22 06:18:39 -06:00
fauxki
a2f6d7919a
Removes RD dress from here, it's to be moved as a subsection of the RD unifrom.
2013-12-22 04:16:56 -08:00
fauxki
08758cfd6a
Adds in new alt RD uniform, as well as moves the RD Dress from the dress section to a subsection of RD uniform.
2013-12-22 04:16:24 -08:00
DJSnapshot
1324be7189
Fix for guns eating empty magazines.
2013-12-21 23:15:36 -08:00
DJSnapshot
2f0b5e31f4
Fix so magazines read correctly on the Colt M1911.
...
Also notice for when the clip falls out.
2013-12-21 22:58:24 -08:00
Chinsky
19c83de6af
Applying Minifix to Yinaderp
...
ID of resulting chemical was not set, so reagents just disappeared
2013-12-22 07:55:03 +04:00
