cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 20:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,136 Commits 8 Branches 26 Tags
fb6b94de8773e6855b362faf84ef8e0f427e608f
Commit Graph

123 Commits

Author SHA1 Message Date
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Chinsky
317eaf4771 Merge pull request #10101 from mwerezak/shards 
Refactors obj flags and changes defined bitflag representation
 2015-08-20 19:47:58 +03:00
mwerezak
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
mwerezak
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
mwerezak
70b74518a1 Moves BLOCKHAIR flags to flags_inv 
Moves BLOCKHAIR and BLOCKHEADHAIR flags to flags_inv
 2015-08-18 17:06:50 -04:00
mwerezak
b80c01ffbe Removes *COVERSEYES 
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
 2015-08-18 17:06:49 -04:00
Hubblenaut
d2e2574f07 Merge remote-tracking branch 'upstream/dev' into dev 2015-08-16 20:39:50 +02:00
PsiOmega
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
mwerezak
c70544f021 Fixes #10509 2015-08-12 00:58:40 -04:00
Hubblenaut
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
mwerezak
263f721f3e Updates more hats 
Also moves hat inhands to separate dmi.
 2015-06-28 01:50:05 -04:00
mwerezak
309dff6aba One less object verb 2015-06-27 23:54:20 -04:00
mwerezak
c7ff5eebe3 Updates hats to use item_state_slots where necessary. 2015-06-27 23:33:33 -04:00
PsiOmega
e5d8b15d01 Compilation fixes. 2015-06-26 20:33:55 +02:00
PsiOmega
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
PsiOmega
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
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