Commit Graph

257 Commits

Author SHA1 Message Date
mwerezak
1b978f9570 Makes update_inv_head() respect item_state and item_icons
Fixes #9873
2015-06-26 01:34:15 -04:00
Hubblenaut
5a026b1553 Overhauls berets, adds corporate black 2015-06-18 18:10:35 +02:00
PsiOmegaDelta
81ee9178bd Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-06-08 09:57:33 +02:00
zonthori
98ca5466e2 Straight base_state 2015-06-07 13:56:11 -06:00
zonthori
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
Zuhayr
dadc434f4e Ported action button system from Paradise/tg 2015-06-02 17:17:13 +09:30
mwerezak
a1185476f8 Makes update_action_buttons() work on-demand
Fixes #9368
2015-05-20 01:28:16 -04:00
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
Zuhayr
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
mwerezak
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
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
71b19d5d8f Stupid typo & missing constants 2015-02-03 18:44:26 +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
SkyMarshal
8898689c5d Cleared out my WIP folder. 2015-02-03 03:20:42 -07:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Zuhayr
5e7133dd08 Converted baseball bats to twohanded weapons. 2015-01-20 19:14:38 +10:30
Zulker Nayeen Nahiyan
b6ab0b64c0 Cleanup global.dm and setup.dm, fix typos in the other files
`code/setup.dm`:
	Fixed large amounts of indenting.
	Fixed large numbers of comments and their clarity.
	Added parentheses to macros using expressions.
	Added FIXME for unused duplicated macros, without certainty of their requirement.
	Removed some duplicate macros present. (`BRUTE`, `BURN`, etc.)
	Removed macro `PI`, and replaced instances of its use with `var/const/Pi` from `maths.dm`

`code/global.dm`:
	Fixed large amounts of indenting, added newlines to long single-lined list definitions.
	Slightly clarified comments.
2015-01-10 02:01:55 +06:00
Zuhayr
823f01f4bf Changed helmet lights over to a general system/overlays. 2014-11-16 13:40:13 +10:30
mwerezak
b7429a76ea Adds tajaran/unathi tacticool sprite sheets
No more clipping into muzzles.
2014-11-13 01:03:29 -05:00
mwerezak
6ac3c4c359 More custom loadout jackets + bandana
Adds custom loadout gear:
Searif's brown leather jacket, NT brown leather jacket, and grey hoodie.
Also brings back the orange bandana, and adjusts some siemens
coefficient values that weren't making sense.
2014-11-02 22:51:33 -05:00
Chinsky
bad385e1d1 Merge pull request #6791 from Zuhayr/dev
Removes references to the Syndicate and renames nuclear emergency mode.
2014-10-21 01:13:17 +04:00
Chinsky
3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm
2014-10-20 04:52:45 +04:00
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
mwerezak
b8cfe87ca2 Fixes #6783, moves spacesuits to a separate file
Adds an update_clothing_icon() proc to clothing items that will call the
relevant icon update proc on the mob which is equipping the clothing, if
any. Changes various clothing procs to not call update icon procs on usr
which may not even be the mob wearing the clothing.
2014-10-18 22:12:15 -04:00
Ravensdale
431d7a2581 Flower hairpin now works for ears and head slots 2014-10-17 20:12:03 -07:00
Zuhayr
6d1fd2886b Added goddamn atrocious wig for Earthcrusher. 2014-10-12 11:58:58 +10:30
Gamerofthegame
a47ec82103 Merge repair 2014-10-03 16:04:31 -04:00
Mordeth221
4e8f57cd2d Added helm for use in events and other things 2014-09-26 17:30:41 +01:00
MrSnapwalk
9b464d268c ERT update 3: electric boogaloo. 2014-08-19 21:46:27 -05:00
PsiOmega
2a46b83dce Adds new items. Source: https://github.com/Baystation12/Baystation12/pull/5928 2014-08-13 09:35:04 +02:00
Whitellama
bbc9150793 Updated body_parts_covered 2014-07-26 17:06:08 -07:00
Zuhayr
a2a5991bae Fixes #5523 2014-07-14 12:23:28 +09:30
Zuhayr
f1d83d3f94 Fixed some vox icons. 2014-07-01 07:29:30 +09:30
Jarcolr
2ed5cb2b1f Fixes #5223
This fixes #5223 and the collectable chef hat. who used "chef" instead
of "chefhat".
2014-06-28 17:19:55 +03:00
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
2014-05-11 13:19:09 +00:00
Zuhayr
a68c4e9c55 Fixes #3993 2014-05-10 10:26:05 +09:30
Mike
1e5ad59b8c More sensible clothing w_class
Helmets, suits, shoes, and large articles of clothing now have a more
appropriate w_class = 3. Slippers are small enough to have w_class = 2.
2014-04-29 14:42:22 -04:00
Ravensdale
50a45b32ae Fixes a define spelling error. 2014-03-03 20:23:21 -08:00
Segrain
b7059519c2 Merge remote-tracking branch 'upstream/master' into dev 2014-02-03 04:36:03 +03:00
Ccomp5950
d38af0c44b Typo fix: corpotate -> corporate.
And superfluous U removal 'MURIKA!
2014-02-01 15:25:00 -06:00
suethecake
6f69e7f821 Stuff. 2014-01-29 18:15:35 -06:00
Mloc-Argent
65f218ee63 Merge branch 'master' into dev-freeze
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 22:01:16 +01:00
Mloc
49c0a30301 Merge branch 'master' into dev
Conflicts:
	baystation12.dme
	html/changelog.html
2013-09-26 10:26:03 +01:00
Mloc-Argent
e9bf414820 Refactors code to work with BYOND 500.
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-22 12:39:48 +01:00
Erthilo
1992a10b52 More attempts at string limit string reduction. 2013-08-31 20:13:03 +01:00
Zuhayr
1b41e4a582 Security item fixes, sprite fixes. 2013-08-28 23:33:46 -07:00
Zuhayr
93011399f0 CubeJackal's new sec uniforms. 2013-08-28 21:18:14 -07:00
Jamini
f05c44dc23 Praying this works
Added Lockable lockers for atmos techs
Adjusted equipment in lockers
Adjusted wardrobe lockers
Added Engineering berets
Rearranged equipment in engineering

Signed-off-by: Jamini <mobiousjami@gmail.com>
2013-08-13 18:57:08 -04:00