97a52b3815
Replaces the default berets with /tg/'s.
2015-12-01 22:26:30 -05:00
1f42ba7961
BERETS DAMMIT
2015-12-01 20:53:25 -05:00
880ba681e6
Combination of my previous PRs, mostly fixes
2015-11-29 11:13:17 -05:00
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
45f15930a0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
...
Conflicts:
.travis.yml
code/_helpers/lists.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/global.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/reagents/dispenser/dispenser2.dm
polaris.dme
2015-11-06 17:41:18 -05:00
9b9bcff9de
Brings back the Ausop helmets added in one of my earlier PRs.
...
Brings back the telescopic shield sprite for the back.
And, as an act of ultimate buuuullshit, a corporate detective uniform, with a detective wardrobe(neither of them are mapped in right now).
2015-10-26 21:02:16 -04:00
ec58f7c705
TG_Port
...
Conflicts:
code/game/objects/items/devices/radio/headset.dm
code/game/objects/items/weapons/shields.dm
code/game/objects/items/weapons/storage/backpack.dm
code/modules/clothing/head/helmet.dm
code/modules/clothing/suits/miscellaneous.dm
code/modules/clothing/under/accessories/accessory.dm
code/modules/mob/new_player/sprite_accessories.dm
icons/mob/back.dmi
icons/mob/head.dmi
icons/mob/mask.dmi
icons/obj/clothing/hats.dmi
polaris.dme
2015-10-11 00:58:26 -04:00
24d9545790
Headset/shield issues.
2015-10-11 00:54:01 -04:00
080e526e9e
Fixes an issue with helmet visors
2015-10-11 00:40:11 -04:00
fb1134a24b
Changes several helmets, fixes shields
...
Conflicts:
code/game/objects/items/devices/radio/headset.dm
code/game/objects/items/weapons/shields.dm
code/modules/clothing/head/helmet.dm
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-10-11 00:39:38 -04:00
9f2ec9c163
Adds three new hair flower pins - yellow, blue, and pink.
...
All three have the same on-ear/head sprite as the current red hair flower pin, but a different in hand sprite.
The red flower pin should remain untouched and is still "hairflower", with the new colours being subtypes.
2015-10-11 00:26:54 -04:00
f3175becc0
Overhauls humanoid vision handling.
...
Clothes now have a flash protection and tint level. If one is wearing multiple items with these modifiers they do stack.
Glasses also have a number of additional additions such as sight flags, see_invis level, and so forth.
Flash protection comes in 4 levels: Reduced, none, moderate, major.
Reduced protection, for example, means the user takes increased damaged from welding.
Moderate protection safeguards mobs from flashes, flash grenades, projectors, etc.
Major protection protects from the above as well as welding.
Tint also comes in 4 levels: None, moderate, heavy, blind
Moderate tint will apply the nearsighted overlay.
Major tint will apply the welding overlay.
Blind will apply the blindness overlay.
The end result is an attempt of less type checking. Any set of glasses may now also contain HUD glasses.
This should make a future rewrite of HUD glasses easier (could have the HUD functionality be a datum rather than separate item).
2015-10-05 08:48:47 +02:00
a9dda6cf3f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
...
Conflicts:
.travis.yml
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/ninja/ninja.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/wizard.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/objects/structures/lattice.dm
code/global.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/reagents/Chemistry-Recipes.dm
config/example/config.txt
polaris.dme
2015-09-06 18:26:06 -04:00
a41ce0bd93
Added the Resomi.
2015-09-04 08:57:03 +09:30
00fa623c9d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/machinery/Sleeper.dm
code/game/machinery/computer/communications.dm
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/global.dm
code/modules/materials/materials.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/projectiles/guns/projectile/automatic.dm
polaris.dme
2015-08-23 01:30:46 -04:00
1466752166
Fixes #166
2015-08-21 14:01:05 -04:00
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
317eaf4771
Merge pull request #10101 from mwerezak/shards
...
Refactors obj flags and changes defined bitflag representation
2015-08-20 19:47:58 +03:00
fd8f6d9639
Removes MASK/HEADCOVERSMOUTH
...
Code that used to check this flag now checks body_parts_covered for FACE
instead. Added a FLEXIBLEMATERIAL item flag to continue to allow vox to
eat food without poisoning themselves.
2015-08-18 17:20:36 -04:00
ac738f3db4
Moves flags values to item_flags var
...
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
2015-08-18 17:18:25 -04:00
70b74518a1
Moves BLOCKHAIR flags to flags_inv
...
Moves BLOCKHAIR and BLOCKHEADHAIR flags to flags_inv
2015-08-18 17:06:50 -04:00
b80c01ffbe
Removes *COVERSEYES
...
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
2015-08-18 17:06:49 -04:00
d2e2574f07
Merge remote-tracking branch 'upstream/dev' into dev
2015-08-16 20:39:50 +02:00
ba240cb768
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/atmoalter/portable_atmospherics.dm
code/game/machinery/spaceheater.dm
code/modules/clothing/head/soft_caps.dm
maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
c70544f021
Fixes #10509
2015-08-12 00:58:40 -04:00
3fb52ab4d5
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-08-11 00:51:18 +02:00
b601310f9b
Men in black
2015-08-08 06:01:35 -04:00
263f721f3e
Updates more hats
...
Also moves hat inhands to separate dmi.
2015-06-28 01:50:05 -04:00
309dff6aba
One less object verb
2015-06-27 23:54:20 -04:00
c7ff5eebe3
Updates hats to use item_state_slots where necessary.
2015-06-27 23:33:33 -04:00
e5d8b15d01
Compilation fixes.
2015-06-26 20:33:55 +02:00
f25e8a7a67
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
2015-06-26 20:28:47 +02:00
6c891406f9
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/update_icons.dm
code/setup.dm
2015-06-26 19:22:31 +02:00
1b978f9570
Makes update_inv_head() respect item_state and item_icons
...
Fixes #9873
2015-06-26 01:34:15 -04:00
5a026b1553
Overhauls berets, adds corporate black
2015-06-18 18:10:35 +02:00
81ee9178bd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-08 09:57:33 +02:00
98ca5466e2
Straight base_state
2015-06-07 13:56:11 -06:00
ccb01cd4ed
Fixes https://github.com/Baystation12/Baystation12/issues/9728
...
Fixes custom welding helmet sprites to break when toggled.
https://github.com/Baystation12/Baystation12/issues/9728
2015-06-07 13:38:44 -06:00
dadc434f4e
Ported action button system from Paradise/tg
2015-06-02 17:17:13 +09:30
a1185476f8
Makes update_action_buttons() work on-demand
...
Fixes #9368
2015-05-20 01:28:16 -04:00
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
dbf8e53020
Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores.
2015-04-26 12:53:26 +09:30
5b037670b3
Removes most instances of item_color
...
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
2015-04-22 17:40:27 -04:00
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
71b19d5d8f
Stupid typo & missing constants
2015-02-03 18:44:26 +03:00
1c3b1087dd
Merge pull request #7582 from Zuhayr/richard
...
Do you like hurting other people?
2015-02-03 18:10:34 +03:00
8898689c5d
Cleared out my WIP folder.
2015-02-03 03:20:42 -07:00
10de826ca3
Removes FPRINT and TABLEPASS flags
2015-01-23 22:27:32 +03:00
5e7133dd08
Converted baseball bats to twohanded weapons.
2015-01-20 19:14:38 +10:30
Mark9013100