PsiOmega
52e6f96dc7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-09 17:55:14 +01:00
Ccomp5950
cab064cd16
Merge pull request #7340 from Zuhayr/dev-freeze
...
Dev-freeze fixes.
2014-12-09 11:48:33 -05:00
Zuhayr
90f5da4e83
Merge pull request #7333 from PsiOmegaDelta/RadioWiresAreNotForYou
...
Fixes #7323 .
2014-12-10 03:15:28 +10:30
PsiOmegaDelta
5842c17536
Merge pull request #7338 from Loganbacca/tapefix
...
Tape fixes
2014-12-09 17:44:23 +01:00
Zuhayr
61cb862690
Merge pull request #7300 from PsiOmegaDelta/RoundEnd
...
Fixes #7295 .
2014-12-10 03:11:38 +10:30
Zuhayr
e80f59742d
Fixes #7316
2014-12-10 00:56:26 +10:30
PsiOmegaDelta
63a5d009c7
Merge pull request #7267 from GinjaNinja32/noise
...
Audible emote improvement, adds ability to emote over radio.
2014-12-09 11:54:57 +01:00
Loganbacca
9fce8921ac
Tape fixes
...
- All paper variants now have taped icon states (might change this to an overlay in future)
- Tape objects inherit overlays from attached papers
2014-12-09 22:53:49 +13:00
PsiOmega
239eb2a0e8
Fixes #7323 .
...
pAIs no longer check and cut wires when interacting with radio functionality.
2014-12-09 09:10:49 +01:00
Ccomp5950
4d615fc294
Merge pull request #7271 from Segrain/dev-freeze
...
Dev-freeze fixes.
2014-12-08 20:40:02 -05:00
PsiOmega
87998f7eb1
Fixes #7295 .
...
Cleans up round end summary.
Removes duplication of traitor summaries.
Attempts to improve how the traitor purchase log is presented.
Ghosts made manifest now have different names and assignments, otherwise one would get messages like "Anguished Phantom played as an Anguished Phantom".
Instead the message is "Anguished Phantom played as a Manifest Ghost".
2014-12-08 17:06:36 +01:00
GinjaNinja32
681a6d21ea
Merge remote-tracking branch 'upstream/dev' into !
...
Conflicts:
code/modules/mob/hear_say.dm
2014-12-08 15:32:49 +00:00
Segrain
7f1b5f0603
Fix for #7285 .
2014-12-08 11:20:46 +03:00
Zuhayr
3c66bd3920
Merge resolution.
2014-12-08 13:01:04 +10:30
Ccomp5950
b4becaa587
Merge pull request #7264 from Zuhayr/master
...
Fixes, death refactor.
2014-12-07 19:38:21 -05:00
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
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
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
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
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
6db8680406
Merge pull request #7097 from GinjaNinja32/sensors
...
Crew Monitoring Computer improvements, wallets working with computers
2014-11-22 22:36:40 +01: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
GinjaNinja32
116705b61b
Fixes wallets, makes CMC use alt-titles, actually remove dead block
2014-11-21 10:42:52 +00: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
Chinsky
af6a262a2c
Merge pull request #7059 from PsiOmegaDelta/Headsets
...
Dynamic Headset Description
2014-11-20 02:41:08 +03:00
Ccomp5950
088c86f692
Merge pull request #7065 from Zuhayr/combitool
...
Added combi-tool.
2014-11-19 08:37:15 -05:00
Zuhayr
2b4cd94650
Merge resolution.
2014-11-19 23:28:09 +10:30
Zuhayr
cec617a414
Merge resolution, compile fixes with outdated glass paths/map.
2014-11-19 23:17:25 +10:30
Zuhayr
c11cb65e19
Added combi-tool.
2014-11-19 23:04:09 +10:30
