Amunak
16c548b03f
Fixes explosives-on-webbing-prevention not working
2014-12-18 05:27:37 +01:00
Amunak
d28cb57f79
Merges upstream/dev to ref, resolves merge conflicts
2014-12-18 03:44:28 +01:00
Amunak
d20ccdb6b4
More name updates and refactoring for research
...
Also fixes compile errors
2014-12-18 03:26:55 +01:00
Amunak
4882074739
Code formatting, EOL at EOF fixes, refactoring
2014-12-18 03:11:49 +01:00
Amunak
edffbc680d
Fixed capitalization of most game items
2014-12-18 03:10:36 +01:00
Amunak
1fcf11cdb5
You can no longer plant explosives on webbing.
2014-12-18 01:17:50 +01:00
Amunak
cc327cb671
Fixes typos in powercells.dm
2014-12-17 20:03:04 +01:00
Amunak
1a972974bc
Moves all circuitboards to their respective files.
...
Computer boards are now in /code/game/objects/items/weapons/circuitboards/computer/.
Buildable machinery boards are in /code/game/objects/items/weapons/circuitboards/machinery/.
Everything else is just in /code/game/objects/items/weapons/circuitboards/.
The circuitboard parent definition is in /code/game/objects/items/weapons/circuitboards/circuitboard.dm.
Did some minor renaming and capitalization fixes on the boards.
2014-12-17 14:31:21 +01:00
PsiOmega
8aa5ee4d9a
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-15 08:58:28 +01:00
Zuhayr
70abe4af0d
Merge pull request #7447 from mwerezak/manual-runtime
...
Alternative fix for manual runtimes
2014-12-14 13:06:16 +10:30
PsiOmega
efb6adb452
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-14 00:27:16 +01:00
mwerezak
168cabf03a
Fixes manual runtimes without modifying the construction of every object
...
Loads configuration before map creation instead.
This reverts commit 37b14bae39
2014-12-13 09:35:36 -05:00
Zuhayr
d2803ec4d7
Merge resolution.
2014-12-13 23:10:46 +10:30
Zuhayr
7efae862a2
Fixes #7290
2014-12-13 23:04:13 +10:30
PsiOmega
37b14bae39
Fixes manual runtimes, ensures initialize is called even after round start.
2014-12-12 20:07:53 +01:00
PsiOmega
2e34cb79a5
Morphic Clerical Kit
...
Buy the morphic chameleon stamp (or Stmap) now and get a new pen which fakes signatures for free.
Attempts to improve the value of said chameleon stamp as it feels rather expensive for what it do.
2014-12-12 10:07:42 +01:00
PsiOmega
cf78fe903b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-12 09:04:09 +01:00
Zuhayr
1ac3eef841
Merge pull request #7380 from PsiOmegaDelta/WikiUrl
...
Fixes #7378 .
2014-12-12 14:11:26 +10:30
PsiOmega
0cc7998197
Fixes #7378 .
...
Now uses the config.wikiurl setting instead.
Assumes wikiurl is in an format which can accept titles, in Bay12's case: http://wiki.baystation12.net/index.php?title=
2014-12-10 22:27:19 +01:00
PsiOmega
3a2aed265b
Fixes #7374 .
...
Now checks the correct ringer flag when receiving a PDA message.
2014-12-10 20:25:03 +01:00
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
