Commit Graph

4036 Commits

Author SHA1 Message Date
GinjaNinja32
6a975a1e6a Noise emotes
Conflicts:
	code/modules/mob/living/carbon/brain/say.dm
2014-12-07 12:09:02 +00:00
Zuhayr
b30be0a352 Fixes #7199 2014-12-07 22:13:31 +10:30
Zuhayr
54ba518762 Fixes #7253 2014-12-07 18:51:20 +10:30
Zuhayr
958eb62ed5 Refactors a lot of reused/redundant death code, fixes #7224 2014-12-07 17:18:56 +10:30
Loganbacca
b3e0cc98cd Implantcase cleanup
- Removed unnecessary icon definitions
- Cleaned up name formatting
- Removed colons
- Added variants for existing implants
2014-12-06 16:20:16 +13:00
Loganbacca
ad6828e70a Update implantcase.dm to absolute paths 2014-12-06 16:17:07 +13:00
Zuhayr
93805d5742 Merge pull request #7225 from PsiOmegaDelta/SyndiBorg
Syndicate borg code refactoring.
2014-12-05 23:37:31 +10:30
PsiOmegaDelta
422ff9b39e Merge pull request #7236 from mwerezak/ops-docking
Remaps the nuke ops shuttle for station docking
2014-12-05 13:57:31 +01:00
mwerezak
5b1f7695e3 Remaps the nuke ops shuttle for station docking
Adjusts the shuttle to incorporate a nice, 2-tile wide docking hatch.
Drops the viro/xenobio docking arm.
Adds a button so that the teleporter blast door can be operated
independently of the airlock blast door.
Fixes some leftover arrivals area just hanging around in space.
Adds a poster specifically for the nuke ops shuttle.
2014-12-05 01:17:17 -05:00
mwerezak
89cef05a19 Merge remote-tracking branch 'upstream/dev' into secure-airlock 2014-12-04 17:15:27 -05:00
mwerezak
58f227ec69 Cleans up airlock electronics
Removes the icon_state hack
Moves airlock electronics creation into it's own proc.
Moved airlock creation from a door assembly to airlock/New()
2014-12-04 16:40:27 -05:00
PsiOmega
1f9cb08102 Syndicate borg code refactoring.
Refactors the borg syndicate code to be more accessible to adminbus.
Syndicate borgs have a jetpack module.
Overrides canUseTopic() to limit what the Syndi-borg can interact.
Still has all access, may be more limited in the future if Bump() is refactored /tg/ style. Admins: Spawn with care.
2014-12-04 12:56:29 +01:00
Loganbacca
fd53575658 Implant cases
- Adds freedom implant in glass case variant
- Changes implants created from protolathe to variants in glass cases
2014-12-04 20:48:45 +13:00
Ccomp5950
5fc6518e21 Merge pull request #7217 from mwerezak/syndie-suit
Adds mask and oxygen tank to uplink kits that provide space suits.
2014-12-03 17:02:48 -05:00
PsiOmega
52346094f8 Fixes #7214.
Dismantling a window should now return an appropriate number of sheets for its type.
2014-12-03 11:06:33 +01:00
mwerezak
7049156519 Adds mask and oxygen tank to uplink kits that provide space suits. 2014-12-02 22:24:53 -05:00
Ccomp5950
19bbc4a004 Merge pull request #7212 from Loganbacca/ducttape
Duct Tape
2014-12-02 20:32:04 -05:00
Ccomp5950
cadfecddce Merge pull request #7202 from PsiOmegaDelta/PlasticBag
Constructable blood packs.
2014-12-02 20:31:12 -05:00
Loganbacca
c5833dfb9a Allow reading of taped paper via examine 2014-12-03 00:02:47 +13:00
Loganbacca
76d87e7c84 Tape fixes
- Shrunk tape roll sprite
- Disabled tearing off individual strips of tape until they have a use
- Fixed a runtime when removing tape with nothing stuck to it
2014-12-02 23:45:33 +13:00
Loganbacca
224b2f3899 Duct Tape
First pass for adding duct tape.
It can stick paper to things.
It can patch up walls (crudely).
Coder sprites!
2014-12-02 23:17:45 +13:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
PsiOmega
8f342ada74 Constructable blood packs.
Can now make your own blood packs from plastic.
2014-12-01 08:40:58 +01:00
Zuhayr
0903bd7fc5 Working on some suit bugs, attempted to fix the welding overlay issue with no success. 2014-12-01 01:51:52 +10:30
Zuhayr
a5ee32d4ca Fixes some colour macros, removes inactive jetpack icon for rigs. 2014-11-30 23:47:34 +10:30
Zuhayr
4c1ea8cd3a Several hardsuit fixes. 2014-11-30 12:46:03 +10:30
Chinsky
8cdd094e1b Merge pull request #7156 from PsiOmegaDelta/RadioFix
Radio fixes
2014-11-30 00:56:53 +03:00
PsiOmega
0f8156e77e Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm
2014-11-29 10:09:03 +01:00
mwerezak
b84bb4ff23 Fixes bubble/hull shield generators not updating air zones, update_nearby_tiles() cleanup. 2014-11-28 19:37:31 -05:00
PsiOmega
8ae93e2616 Radio fixes
Intercoms no longer have to check wiring, they can simply use the listening/receiving flags.
Can no longer enable reception/broadcasting if the relevant cables have been cut.
2014-11-27 17:10:26 +01:00
PsiOmegaDelta
fae43793a4 Merge pull request #7142 from PsiOmegaDelta/Singularity
Syndicate beacon power consumption and objective.
2014-11-26 22:08:48 +01:00
Chinsky
ee815b719e Merge pull request #7129 from PsiOmegaDelta/Wires
Wires
2014-11-27 00:02:39 +03:00
PsiOmega
d6c0ebf138 Syndicate beacon power consumption and objective.
Cleans up syndicate beacon power consumption.
Objectives are now only given if not disabled.
Relative-proc cleanup.
2014-11-26 09:56:15 +01:00
GinjaNinja32
48343a23fb Fix most nullspace items, rewrite floor tiles not to del() on every place/remove 2014-11-24 17:05:46 +00:00
PsiOmega
e98649fa5e Plastique wiring. 2014-11-24 11:21:31 +01:00
PsiOmega
1e479536db Radio wires. 2014-11-24 10:19:57 +01:00
PsiOmega
dc5ab9bb64 Merge remote-tracking branch 'upstream/master' into dev 2014-11-23 12:07:45 +01:00
PsiOmegaDelta
8e50a32ba8 Merge pull request #7103 from Segrain/dev
Robotic appearances.
2014-11-23 12:05:51 +01:00
PsiOmegaDelta
6db8680406 Merge pull request #7097 from GinjaNinja32/sensors
Crew Monitoring Computer improvements, wallets working with computers
2014-11-22 22:36:40 +01:00
PsiOmegaDelta
d9aae79a32 Merge pull request #7008 from Zuhayr/spaceninjas
Hardsuit/voidsuit change, ninja refactor.
2014-11-22 09:30:54 +01:00
Ccomp5950
d0383883c2 Merge pull request #7094 from Neerti/borg_hud_port_2
Semi-ports /tg/'s cyborg HUD, now with less merge conflict!
2014-11-22 03:27:10 -05:00
ccomp5950
eb83d5ccec Solves a runtime when someone tries to mop up blood.
proc name: afterattack (/obj/item/weapon/mop/afterattack)
  source file: mop.dm,45
runtime error: undefined proc or verb /obj/effect/decal/cleanable/blood/tracks/footprints/clean().
2014-11-22 03:02:40 -05:00
Zuhayr
1c35f8825b Dummied out the AI movement code for a later project. 2014-11-22 08:04:06 +10:30
Zuhayr
c8e8e663f9 Merge resolution. 2014-11-22 07:31:44 +10:30
Segrain
7f199874fb Examining robomodules. 2014-11-21 19:28:46 +03:00
GinjaNinja32
116705b61b Fixes wallets, makes CMC use alt-titles, actually remove dead block 2014-11-21 10:42:52 +00:00
Neerti
72c9b2eb15 Resolves conflicts, cherrypicks my code. 2014-11-21 03:32:00 -05:00
PsiOmegaDelta
350273dea4 Merge pull request #7071 from Segrain/dev
Equipping custom loadout.
2014-11-21 08:03:24 +01:00
Atlantiscze
3003777b6a Adds mwerezak's suggestions
- Power monitor is now /computer/ subtype
- Different rounding of values in power monitor display
- Unfortunately, PDA power monitoring for engineers is broken and probably won't be fixed as it relies on old powernet monitoring computers. Laptops work OK
2014-11-20 16:24:26 +01:00
Atlantiscze
78a4b424ae Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-20 10:55:33 +01:00