Commit Graph

4102 Commits

Author SHA1 Message Date
Zulker Nayeen Nahiyan
0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm
2015-02-04 04:44:09 +06:00
Chinsky
84472462ab Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into firefirEFIREBURNAHAHAHA
Conflicts:
	code/modules/mob/living/living_defines.dm
2015-02-03 18:30:18 +03:00
Chinsky
95ff9570ee Merge pull request #7930 from RKF45/newpaint
Generic paint
2015-02-03 18:15:42 +03:00
Chinsky
aa7fde250c Merge pull request #7801 from Mloc/bs12-glowypipes
refactor buckling + glowy HE pipes
2015-02-03 18:12:09 +03:00
Chinsky
1c3b1087dd Merge pull request #7582 from Zuhayr/richard
Do you like hurting other people?
2015-02-03 18:10:34 +03:00
PsiOmega
a57cd8c380 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-03 14:51:54 +01:00
PsiOmega
1732d0c79a Merge remote-tracking branch 'upstream/master' into TheGreatPurge
Conflicts:
	code/WorkInProgress/computer3/computers/message.dm
	code/WorkInProgress/kilakk/responseteam.dm
2015-02-03 14:16:14 +01:00
Chinsky
95eacd2185 Merge pull request #8008 from volas/sanitize_procs
Fixes for some sanitize moments
2015-02-03 15:08:47 +03:00
Chinsky
72463a35f3 Another pass at WIP folder 2015-02-03 12:14:13 +03:00
Chinsky
2a1f0849d8 Cleaned out my WIP folder. 2015-02-03 08:27:18 +03:00
D Anzorge
abeb634d01 Make borg radio window tell if loudspeaker is on 2015-02-02 16:27:14 -05:00
D Anzorge
609f9848bc Fix borg radio weirdness
Borg radio interface toggling was backwards: when usr got the message that the subspace mode was
disabled, the radio would actually enter subspace mode.
2015-02-02 16:27:14 -05:00
RKF45
6577cd2a55 Merge remote-tracking branch 'upstream/dev' into newpaint
Conflicts:
	code/game/objects/items/weapons/paint.dm
2015-02-01 23:04:18 +01:00
RKF45
4d8dd50cea Mixing of paint
The generic paint can now be mixed and tranferred.
2015-02-01 22:54:18 +01:00
volas
8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
PsiOmega
6fabf503e1 Merge remote-tracking branch 'upstream/master' into dev 2015-02-01 17:39:19 +01:00
RKF45
4eb3e16f72 Reviewing paint recipes
All recipes make "paint" and have different colours via var/resultcolor
White paint can also be made non-ghettoly.
2015-02-01 01:34:39 +01:00
Chinsky
b995c856a9 Merge pull request #7924 from Kelenius/ofTablesAndPass
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
Zuhayr
b280cb6d42 Fixes #7919 2015-01-29 11:27:56 +10:30
Chinsky
34a7549460 Merge pull request #7963 from Baystation12/dev-freeze
freeze->warlock
2015-01-27 21:56:07 +03:00
Loganbacca
34d44f8732 Tape fixes
- Fixed taping paper bundles
- Reduced issues with sticking papers around corners
- Removed a couple of colons from paper_bundle.dm
2015-01-26 15:16:27 +13:00
RKF45
c5afd47bc6 Eating crayons 2015-01-25 17:11:06 +01:00
ccomp5950
44a9a722d0 Removed unused code that was intended for a different implenetation. 2015-01-25 07:21:14 -05:00
ccomp5950
89652ae5e3 JSON caching for nanoui
You get to cache data, make the best of it.

NanoUI for PDA now won't shove the manifest through list2json every tick, it will cache the json for manifest and shove it into the cache_data so list2json tacks it onto the end.
2015-01-25 06:22:30 -05:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Zuhayr
22edc4bc90 Merge pull request #7920 from Baystation12/dev-freeze
Dev freeze into dev
2015-01-23 13:01:23 +10:30
PsiOmegaDelta
c780437354 Merge pull request #7911 from mwerezak/virus
Virus Protection Fix
2015-01-22 18:40:19 +01:00
unknown
7590bbac99 Infection chance proc improvements
Instead of magic type bits, the infection protection value of clothing is mostly based on it's bio armor value, which is much more flexible. Also gloves and shoes to contribute to protection values, and adjusts surgical mask bio protection.
Hardsuits gain voidsuit level bio protection, when sealed.
Wearing a face mask helps prevent others from catching airborne diseases.
Also fixes #7909
2015-01-22 11:10:57 -05:00
Kelenius
cee3c3eeff Replaces icon proc with image 2015-01-20 16:11:05 +03:00
Kelenius
d5c1c8672d Conflict fix 2015-01-20 15:02:25 +03:00
Kelenius
1949f105f1 Removes a debug world << 2015-01-20 14:55:26 +03:00
Zuhayr
c61537f265 Adjusting twohanded values as discussed in diff. 2015-01-20 19:15:10 +10:30
Zuhayr
5e7133dd08 Converted baseball bats to twohanded weapons. 2015-01-20 19:14:38 +10:30
Zuhayr
aa5013fa08 Merge pull request #7885 from Baystation12/master
Updating dev-freeze from master.
2015-01-20 18:49:03 +10:30
Zulker Nayeen Nahiyan
490027405a Merge remote-tracking branch 'origin/dev' into dev
Conflicts:
	code/modules/virus2/helpers.dm
2015-01-19 02:15:38 +06:00
Kelenius
5f496524d2 Changes how sprays work and re-adds silicate
Sprays will spray directly at solid objects if they are clicked (walls,
windows, etc).
Makes removal of wall rot with plant-b-gone actually work.
Re-adds silicate with the old recipe. It repairs windows and makes them
more damage-resistant up to half damage taken.
2015-01-17 19:11:41 +03:00
Zuhayr
c467e99f15 Merge pull request #7848 from comma/master
Moar fix
2015-01-16 23:13:53 +10:30
Zuhayr
dd3c131463 Merge pull request #7843 from Loganbacca/freezefix
Closet fixes
2015-01-16 23:12:13 +10:30
Chinsky
6e7eb38c5d Merge pull request #7850 from Baystation12/master
master -> freeze
2015-01-16 14:23:03 +03:00
Chinsky
d42482c7cc Fixes #7259
Removes forks used for ribcage opening/closing since it overlapped with internal organ surgery and for some reason even priorities didn't help with that.
2015-01-16 14:18:51 +03:00
Loganbacca
7435f7574e Closet file reorganisation
- Moved walllocker.dm to
code/game/objects/structures/crate_lockers/closets
- Moved other unused closet files to the code/unused folder
2015-01-16 12:04:59 +13:00
Loganbacca
780b1fb096 Fixed placing mounted modules in closets
- Fixes placing mounted modules in closets and crates
- Removed a couple of colons
2015-01-16 11:43:45 +13:00
Chinsky
b4840aec54 Merge pull request #7616 from atlantiscze/boomfix
Wireless Wires Bugfix
2015-01-15 23:57:37 +03:00
Chinsky
95e4f53258 Ported TG's code for burny mobs, by ergoslavi. 2015-01-15 23:47:07 +03:00
Zuhayr
8ec096581c Fix for blood drip overlaying + secret feature 2015-01-15 20:10:32 +10:30
PsiOmega
1382df5dad Fixes #7802.
items/examine() now properly calls and returns the result of ..().
2015-01-14 08:24:33 +01:00
Loganbacca
985d410657 Air tank interface fix
- Allows tanks to be toggled on and off as internals from their UI.
- If internals are off, all tanks capable of being used for internals
will display "tank is connected to a mask".
- If internals are on, only the tank that is actively supplying air is
listed as "connected" and "open". All others will display as "not
connected".
- Tanks inside rigs will correctly display their status in their UI (if
you open it before putting it in the rig, but cannot be toggled on
through the interface. Toggling them on with the internals button works.
2015-01-13 23:19:58 +13:00
Mloc-Argent
537b78fc80 refactor buckling to be more generic
Buckling procs and vars have been moved down to /obj.
Behaviour is mostly the same, but you can buckle cuffed people to
 pipes and they will automatically unbuckle if the cuffs are removed.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2015-01-12 21:28:31 +00:00
Zuhayr
61d35bd474 Merge resolution. 2015-01-12 07:17:02 +10:30
Loganbacca
527e83a4e3 Blood/oil stain fixes
- Fixed item descriptions calling oil-stained items "bloody"
- Fixed mob examine describing oil-stained bare hands and feet as "bloody"
- Fixed blood overlays on shoes not updating after walking through different colored blood
- Removed some colons
2015-01-12 01:08:28 +13:00