cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 21:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,385 Commits 9 Branches 26 Tags
062a092cfe129502fb323fdff70da03880c6662f
Commit Graph

3104 Commits

Author SHA1 Message Date
Neerti
062a092cfe Refactors how armor works. It's now less of a dice roll, but still retains some randomness. This makes weaker armor worth using, and stronger armor not godlike. 
Also fixes a bug with the auto shotgun causing runtimes.
 2015-12-01 03:45:47 -05:00
Neerti
78e5701b5c Replaces most instances of Nyx to Vir. 2015-11-26 01:01:06 -05:00
Neerti
3ebd27eece Forgot to commit this. 2015-11-22 22:03:50 -05:00
PsiOmegaDelta
d709363ff7 Radio NanoUI. 
Ports the radio NanoUI interface from Paradise with some Bay-adjustments.
Based on the latest revision https://github.com/ParadiseSS13/Paradise/pull/2369.
 2015-11-22 21:42:54 -05:00
PsiOmegaDelta
3eae0d5101 Destroy tweaks. 
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
 2015-11-22 21:42:27 -05:00
PsiOmegaDelta
2200bfe436 Map tweaks. 
Adds a couple of decals to the Thunderdome.
Rotates sleepers/scanners on z-level 1 and 2. Had already done so for z-level 5. Fixes #11058.
Full tile windows no longer appear to exist? Replaces the glass on the toxin test site with reinforced glass spawners.
 2015-11-22 21:41:41 -05:00
PsiOmega
5047ea8267 Observers can now view radio settings, admins can alter them. 
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
 2015-11-22 21:40:59 -05:00
PsiOmega
5bf7158c9d Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys. 
Conflicts:
	html/changelogs/PsiOmegaDelta-Radio.yml
 2015-11-22 21:37:21 -05:00
PsiOmega
1bd40cf8aa Makes the cyborg radio menu more consistent. 2015-11-22 21:36:18 -05:00
PsiOmega
42342bedcb Rotates and otherwise cleans up map intercom usage. 
Conflicts:
	code/controllers/communications.dm
 2015-11-22 21:35:36 -05:00
PsiOmega
92afc566bb Makes it possible to select department channels on intercoms. 
Conflicts:
	code/game/objects/items/devices/radio/intercom.dm
	code/game/objects/items/devices/radio/radio.dm
 2015-11-22 21:34:13 -05:00
Neerti
dd3ab4dac0 Finishes new ling, need better sprites but that's for another time. 2015-11-18 16:20:28 -05:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
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
PsiOmegaDelta
19051ec27e Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-02 09:25:04 +01:00
PsiOmegaDelta
694a35c10b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-02 09:08:06 +01:00
Chinsky
1417f4f40b Merge pull request #11344 from Hubblenaut/tape 
Tape - Sprites and Algorithm Changes
 2015-11-02 00:10:03 +03:00
PsiOmegaDelta
a9f7b3a325 Merge pull request #11247 from Hubblenaut/laundry 
Adds laundry basket
 2015-10-31 11:16:14 +01:00
PsiOmegaDelta
ab2ddfcba7 Atmospheric computer circuit additions. 
Adds several missing variables used in the construction and deconstruction set of gas management computers. Fixes #11392.
Computers also no longer attemps to qdel a type on Destroy()
 2015-10-29 16:55:58 +01:00
PsiOmegaDelta
e37394e8fa Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
 2015-10-25 20:28:48 +01:00
PsiOmegaDelta
7d4f51be8e Merge pull request #10287 from mwerezak/attack-cleanup2 
Refactors item attack click and mob melee attack handling code
 2015-10-25 08:43:47 +01:00
PsiOmegaDelta
d845a2f587 Generalizes the feed and force feed checks. 2015-10-23 10:57:55 +02:00
PsiOmegaDelta
8305404a14 Can no longer use utensils to eat if you lack the means. 
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes  #11333.
 2015-10-22 16:52:07 +02:00
Hubblenaut
8f921682a0 Police tape rewrite 2015-10-22 14:31:04 +02:00
PsiOmegaDelta
55f6c1c0b5 Merge pull request #11204 from Hubblenaut/medical 
Bruise Packs, Changes and small Fixes
 2015-10-19 16:17:16 +02:00
Hubblenaut
cbd0972bfa Bruise packs are used per wound and take time to apply 2015-10-16 16:36:04 +02:00
PsiOmegaDelta
0c3b6c01e2 Radio NanoUI. 
Ports the radio NanoUI interface from Paradise with some Bay-adjustments.
Based on the latest revision https://github.com/ParadiseSS13/Paradise/pull/2369.
 2015-10-16 16:01:36 +02:00
PsiOmegaDelta
299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
 2015-10-16 13:02:59 +02:00
PsiOmegaDelta
fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
 2015-10-16 11:04:43 +02:00
ccomp5950
bb93245ccd Fixes the tapping messages check. 
The check is now in Topic() instead of being based on the href link sent.

Resolves #11039
 2015-10-15 21:11:06 -04:00
Chinsky
2a88b4d0aa Merge pull request #11219 from PsiOmegaDelta/150929-HumanoidVision 
Overhauls humanoid vision handling.
 2015-10-15 19:15:28 +03:00
mwerezak
07881e7495 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2 
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
 2015-10-15 07:08:16 -04:00
PsiOmegaDelta
e79e82f55d Gives replacement light boxes the same fitness treatment. 2015-10-15 10:42:51 +02:00
PsiOmegaDelta
fd03e4d59b Surgical kits can now contain their equipment. 
The surgical kit can now contain the equipment it came with. It can also not contain more items of a given type than it was spawned with.
This means that even if the storage container otherwise has sufficient space it can, for example, still only ever contain 1 surgical saw.

Fixes #11298. Fixes #11297.
 2015-10-15 10:20:49 +02:00
PsiOmegaDelta
3fd28dd361 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	html/changelogs/.all_changelog.yml
 2015-10-14 08:41:38 +02:00
PsiOmegaDelta
3fd172ee63 Merge pull request #11294 from Baystation12/master 
Dev-freeze
 2015-10-14 08:40:03 +02:00
Hubblenaut
1c8ec1a700 Fixes stack creation logic and return value 2015-10-11 22:02:05 +02:00
PsiOmegaDelta
27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml
 2015-10-11 17:37:01 +02:00
PsiOmegaDelta
38c6ba3a07 Code relocation. 2015-10-11 17:31:21 +02:00
PsiOmegaDelta
070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-10-11 17:17:41 +02:00
SinTwo
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
Neerti
24d9545790 Headset/shield issues. 2015-10-11 00:54:01 -04:00
Mark9013100
1273a51f83 Merges f-card box and evidence bag box 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
 2015-10-11 00:41:46 -04:00
Mark9013100
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
SinTwo
a2b24d64b7 TG_Port_2 
Conflicts:
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preferences_gear.dm
	code/modules/clothing/under/accessories/accessory.dm
 2015-10-11 00:36:13 -04:00
Mark9013100
1eab12fc26 Two minor edits to ERT equipment 2015-10-11 00:30:10 -04:00
Mark9013100
3cc7a77846 The detective colt can now be reskinned 
Conflicts:
	code/modules/projectiles/guns/projectile/pistol.dm
 2015-10-11 00:30:06 -04:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
 2015-10-10 23:17:26 -04:00
Chinsky
debe69aa80 Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer 
Fixes #11263.
 2015-10-10 17:51:15 +03:00
PsiOmegaDelta
fd3370c01f Fixes #11263. 
Now possible to use items other than emags on holodeck computers
Blobs no longer make computers lose their density state.
Holodeck computers can now be repaired (and built, but since they cannot be configured they'll be useless).
Fixes #11263.
 2015-10-10 10:11:48 +02:00