cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-31 11:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,062 Commits 8 Branches 26 Tags
fd77756b5b22370e1d4e4e98e89fdfabf1be27e4
Commit Graph

5000 Commits

Author SHA1 Message Date
PsiOmegaDelta
9057655da6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/clothing/spacesuits/void/void.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-08-24 10:31:30 +02:00
PsiOmegaDelta
c376c08cc0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/girders.dm
	code/modules/mob/living/carbon/human/human_damage.dm
 2015-08-24 10:23:12 +02:00
Zuhayr
23564bda0c Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess 
Synths now relies on access permissions as well.
 2015-08-24 17:45:10 +09:30
Zuhayr
863d75076d Merge pull request #10759 from mwerezak/girders 
Fixes reinforcing girders through windows, adds an SS13-like interface for reinforcing
 2015-08-24 17:28:08 +09:30
PsiOmegaDelta
0b163b89ae Fixes #10815. 
Now uses audible message. Added a message for deaf mobs.
 2015-08-24 09:16:35 +02:00
Chinsky
1a7b0e33a4 Merge pull request #10758 from FrickenChris101/patch-1 
Flashlight Icon toggle fix
 2015-08-24 00:40:26 +03:00
Zuhayr
89f498e3e8 Merge pull request #10811 from mwerezak/qdel 
Fixes
 2015-08-23 07:41:10 +09:30
mwerezak
d62ff87ec9 Fixes #10689 
Also some refactoring of locker stuffing.
 2015-08-22 14:32:15 -04:00
mwerezak
13c760c5bb Fixes #9453 and fixes #10614 2015-08-22 11:09:17 -04:00
GinjaNinja32
2341d2afa9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-22 15:44:02 +01:00
GinjaNinja32
4e56b82ec0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-22 15:28:49 +01:00
mwerezak
cfa8ab3fd0 Removes bear traps from the custodial closet, adds autolathe recipe 2015-08-22 02:31:19 -04:00
mwerezak
4396e5a5bc Merge pull request #9891 from Zuhayr/dev 
Adds variables for CentComm, NanoTrasen and the station name.
 2015-08-21 14:23:57 -04:00
Zuhayr
56131e1053 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 03:17:16 +09:30
Zuhayr
3c477dfa5e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 03:11:53 +09:30
Zuhayr
bb82f80885 Added get_bodytype() species proc as groundwork for subspecies. 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 02:53:16 +09:30
Zuhayr
8701205783 Pariah nerfs. 
Conflicts:
	code/modules/mob/living/carbon/human/species/outsider/vox.dm
	code/modules/organs/organ_alien.dm
 2015-08-22 02:51:42 +09:30
Zuhayr
edf74e4721 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-22 02:30:14 +09:30
Zuhayr
bf313ae238 Merge pull request #9851 from mwerezak/armourpen 
Adds armor penetration system
 2015-08-22 02:22:17 +09:30
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Zuhayr
6c27a8dd8d Merge pull request #9159 from Kelenius/ofClicksAndCooldowns 
Removes click cooldowns almost everywhere.
 2015-08-22 01:51:05 +09:30
Zuhayr
3632acd3db Merge pull request #10786 from PsiOmegaDelta/150821-SortedAccess 
Cleans out unused access definitions and sorts access lists.
 2015-08-22 01:34:08 +09:30
Zuhayr
b4b7719557 Merge pull request #9888 from Vivalas/dev 
[DEV] Re-adds the new uplink item
 2015-08-22 01:34:01 +09:30
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
 2015-08-21 16:15:07 +03:00
PsiOmegaDelta
56523d0941 Cleans out (mostly) unused access definitions and makes access lists sorted. 2015-08-21 14:45:45 +02:00
PsiOmegaDelta
1e7251ded4 Id card handling changes. 
Equipment now first checks if an id card may be removed, rather than always forcefully doing so.
Station synthetics now have a custom id, rather than re-using the captain's spare, as utilizing robotic storage would otherwise make their id cards available for public use.
 2015-08-21 14:04:06 +02:00
mwerezak
8626fbfd39 Removes the reinforce girder verb 2015-08-20 23:50:40 -04:00
mwerezak
db7ba70415 Adds SS13-like interface for reinforcing girders 2015-08-20 23:50:16 -04:00
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
PsiOmegaDelta
cd06409a1f Makes it possible for syndicate borgs to copy access from other ids. 2015-08-20 13:49:53 +02:00
PsiOmegaDelta
c346b99371 Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess 
Conflicts:
	code/game/objects/items/weapons/cards_ids.dm
 2015-08-20 12:42:51 +02:00
PsiOmegaDelta
c2e2252342 Synth access and icon update changes. 
Refactors how synthetics set their modules. On login, if appearance selection was initiated but not finalized, the selection options popup again. Fixes a long-standing issue of borgs being able to look like the standard module by loging out.
Ensures the syndicate agent IDs and syndicate borgs will always have the same initial access permissions.
Removes now unnecessary syndicate snowflake code from NanoUI.
Synths now utilize actual ids.
 2015-08-20 12:40:08 +02:00
Zuhayr
c8b6813426 Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery 
Uplink Items - Part III
 2015-08-20 19:19:12 +09:30
PsiOmegaDelta
1c92c62399 Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess 2015-08-20 10:01:19 +02:00
mwerezak
efc3121f68 Fixes reinforcing girders through windows, unbalanced span 2015-08-19 20:41:24 -04:00
FrickenChris101
a4b3ab1ca5 Flashlight Icon toggle fix 
Just added additional code to update_brightness call and initialize.. Wasn't properly reflecting light being on or off.
 2015-08-19 20:17:59 -04:00
Ccomp5950
11eefbc4c9 Merge pull request #9856 from Hubblenaut/dev 
Beret Resprites
 2015-08-19 17:56:37 -04:00
GinjaNinja32
a9773207b2 Merge remote-tracking branch 'upstream/dev' into client_dir 2015-08-19 09:42:48 +01: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
2cb46e035c Removes unused obj flags and fixes overlapping flags 
Removes ONESIZEFITSALL and NOSHIELD, which were unused.
 2015-08-18 17:08:41 -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
HarpyEagle
8a9caac7cc Splits species flags 
Splits several species flags off into a separate appearance_flags var, to avoid rollover.
 2015-08-18 17:02:44 -04:00
HarpyEagle
c136bd47cc Improves shard-stepping 2015-08-18 17:01:39 -04:00
PsiOmega
e92e819bd9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-18 18:29:01 +02:00
PsiOmega
75c7313c46 On merge changes and map conflict fixes. 2015-08-18 18:19:51 +02:00
GinjaNinja32
a5e975ce1c Fix cables and windows; sleepers, cryopods and donut boxes will now rotate correctly with client.dir 2015-08-18 13:43:11 +01:00
PsiOmegaDelta
1ce65e0aa8 Post-merge decal cleanup. 
Misc decal additions and merge fixes on most Z-levels.
Crescent windows were all kinds of a mess for some reason. Replaced instances with a spawner instead.
Asteroid solars were all cramped with solid walls. Gave them more space to allow for at least some power production.

Fixes warning stripe corners on all Z-levels. To correct the following search replace can be used:
/obj/effect/floor_decal/industrial/warning/corner{dir = 8} -> /obj/effect/floor_decal/industrial/warning/corner{dir = 5}
/obj/effect/floor_decal/industrial/warning/corner{dir = 1} -> /obj/effect/floor_decal/industrial/warning/corner{dir = 8}
/obj/effect/floor_decal/industrial/warning/corner{dir = 5} -> /obj/effect/floor_decal/industrial/warning/corner{dir = 1}
 2015-08-18 12:33:49 +02:00
GinjaNinja32
5a5eb31e99 Barsigns now rotate correctly with client.dir, improved the code a bit 2015-08-18 07:18:13 +01:00
Zuhayr
80dbe49ee1 Removing unneeded defines. 2015-08-19 14:23:27 +09:30
Zuhayr
e3d9bc90e3 Added more colour defines, added functionality to the floor painter. 2015-08-18 13:41:04 -07:00