PsiOmega
52e6f96dc7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-09 17:55:14 +01:00
Zuhayr
53627175ef
Merge pull request #7347 from Baystation12/master
...
Updating dev-freeze from master.
2014-12-10 03:21:56 +10:30
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
Segrain
4fb83010e1
Fix for #7322 .
2014-12-09 14:55:25 +03:00
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
mwerezak
ab89ce59dc
Merge remote-tracking branch 'upstream/dev-freeze' into poster
...
Conflicts:
code/game/objects/effects/decals/contraband.dm
2014-12-09 00:17:22 -05:00
Ccomp5950
6ade2b46a0
Merge pull request #7282 from mwerezak/tape-roll
...
Adds tape rolls to the tool storage spawner list
2014-12-08 20:46:58 -05: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
mwerezak
d506eca89a
Adds tape rolls to the tool storage spawner list
2014-12-08 00:15:27 -05:00
mwerezak
f9564cbe5e
Poster fixes
...
Fixes #7261
Fixes placed posters being visible on both sides of the wall.
Fixes the poster_type var used to specify certain poster designs on the
map not working correctly, and makes the nuke op shuttle poster an
actual poster.
Poster placement now belongs to the poster object instead of turf/simulated/
Posters can now be placed on unsimulated and shuttle walls.
2014-12-07 22:30:08 -05:00
Zuhayr
3c66bd3920
Merge resolution.
2014-12-08 13:01:04 +10:30
Segrain
639c61721b
Fix for #7261 .
2014-12-08 03:58:42 +03:00
Ccomp5950
b4becaa587
Merge pull request #7264 from Zuhayr/master
...
Fixes, death refactor.
2014-12-07 19:38:21 -05:00
Zuhayr
b556609e27
Replaces some macros.
2014-12-08 10:34:36 +10:30
Zuhayr
dfca49c900
Fixes #7105
2014-12-08 05:14:04 +10:30
Zuhayr
1211360118
Fixes #6974
2014-12-08 05:00:54 +10:30
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
