cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 19:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,864 Commits 8 Branches 26 Tags
a3bf1b2492c3f98bd3f150d7dfd20598d7dab55c
Commit Graph

16756 Commits

Author SHA1 Message Date
Arokha Sieyes
a3bf1b2492 Merge pull request #1457 from Yoshax/permitguns 
Adds Aerowing and Table's custom item/gun stuff
 2017-05-03 22:08:26 -04:00
JoanRisu
88e5fe0ead Resolves #1188 and #794 (#1427) 
* resolves  #1188 and #794

* Moves custom taur armor stuff to the fluff items file. Adds comments to items for organizational purposes.

* Fixes

* Additional fixins

* Thanks Travis
 2017-05-03 22:07:38 -04:00
Yoshax
c939cf1842 Adds Aerowing and Table's custom item/gun stuff 2017-05-01 14:26:14 +01:00
Arokha Sieyes
ae96b83098 Merge pull request #1436 from LiquidFirefly/master 
Gazer Fluff.
 2017-04-29 19:55:28 -04:00
Yoshax
612e7f3b64 Syncs some missed changes from Polaris (#1445) 
* Adds in some missed changes from Polaris

* Fixes the changelog by taking it straight from Polaris
 2017-04-29 19:31:02 -04:00
Cameron653
0444c6093e Fixes Unathi TF organ rejection (#1439) 
* Fixes people dying from Unathi TF

* Targeting only unathi doesn't work

Reverting back to original fix.

* A bit of rearrangement.

The for statement below it isn't needed for the internal organs, but
it's nice to have it happen after the internal organs are recreated.

* Fixes internal organ rejection
 2017-04-29 19:21:26 -04:00
Layla Crosse/Occula Drenn
a77def9829 Add's LiquidFirefly's Gazer fluff item stuff 
Add files via upload

Add files via upload

Add files via upload

Added Gazertail to repository, fixed error.

Reverting bad changes.

Apologies for not reading.

Adding Monoeye.

Fixing bad changes, Readding monoeye.
 2017-04-29 02:50:26 +01:00
SeigaSeiga
0f77583881 Adds the cyborg visor as a fluff item, a child of regular sunglasses. Adds Seiga:Alfonso to custom_items.txt. 2017-04-28 23:06:20 +01:00
Yoshax
7662693036 Fixes an issue with tails 2017-04-27 22:35:41 +01:00
Arokha Sieyes
4aa8df4171 Merge pull request #1430 from VOREStation/aro-announcer 
Update Codex to have our lore
 2017-04-25 19:08:43 -04:00
Arokha Sieyes
6a98b982a7 Update Codex to have our lore 
Updates the lore in the Codex books to be accurate to our lore, and invented a bunch of extra lore on the spot to make it make sense. Seems fine to meeeeeeee.
 2017-04-25 18:59:05 -04:00
Arokha Sieyes
f1a72b7eb9 Merge pull request #1429 from VOREStation/aro-sync 
Polaris Sync
 2017-04-25 18:35:58 -04:00
Arokha Sieyes
4c2caf11b7 Replace 'magic' messages with Facility PA 
This replaces the mystical messages of things like Command Reports, the 'All hands' message when a CD joins, and head announcements with a PA system that behaves more reasonably than pushing all the messages out of the chat box. Nothing about the systems changed, just the way they show up. They still make the sound, too.
 2017-04-25 15:15:45 -04:00
Arokha Sieyes
055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml
 2017-04-25 15:04:54 -04:00
Anewbe
40e58d6f5b Merge pull request #3363 from LorenLuke/buckle-give 
Fixes 3314.
 2017-04-24 14:44:55 -05:00
LorenLuke
af74306b43 Fixes 3314. 2017-04-24 12:03:04 -07:00
Arokha Sieyes
b7898c1eaf Merge pull request #1393 from Cameron653/master 
Transformation Changes
 2017-04-23 23:54:15 -04:00
Arokha Sieyes
4f6ea943da Merge pull request #1419 from OrbisAnima/orb-cargo-love 
Added 3 new crates to cargo:
 2017-04-23 23:53:59 -04:00
Arokha Sieyes
7519133444 Merge pull request #1417 from Yoshax/qollife 
Fixes some character setup issues
 2017-04-23 23:53:15 -04:00
Neerti
a12fe9fa5a Merge pull request #3354 from Anewbe/vox_suit_tweak 
Slowdown tweak on vox suit
 2017-04-23 18:57:20 -04:00
Anewbe
08dedaaf98 Merge pull request #3353 from Neerti/4/21/2017_circuit_fixes 
Circuit Bugfixes & QoL
 2017-04-23 17:08:12 -05:00
Anewbe
13e9361f3e Merge pull request #3359 from Neerti/4/23/2017_drone_id 
Adds Drone Identification Cards
 2017-04-23 16:24:22 -05:00
Neerti
6dbff1ee83 Adds Drone Identification Cards 
Drone FBPs now spawn with an EIO issued ID alongside their NT ID card.
Also makes the bartender's permit automatically name itself when created by the job_controller.
 2017-04-23 16:30:32 -04:00
Anewbe
4e048463cb Fixes a chameleon gun bug 2017-04-23 15:23:15 -05:00
Neerti
4f3e3282b7 Merge pull request #3351 from Atermonera/Records 
Brain type is shown on all records
 2017-04-23 13:56:51 -04:00
Anewbe
f9f039d96d Slowdown tweak on vox suit 2017-04-23 11:06:43 -05:00
Anewbe
8d8be1d52c Merge pull request #3350 from Mechoid/Drink_bot_the_Re-Drinkening 
Service Borg 2: Drink Synthesizer and Rapid Service Fab changes.
 2017-04-23 09:43:24 -05:00
Neerti
2c25fcec02 Fixes Circuit Bugs & QoL chances 2017-04-23 09:51:53 -04:00
Anewbe
751da2a195 Merge pull request #3347 from Anewbe/hooch 
Stimm recipe changed
 2017-04-22 20:50:23 -05:00
Anewbe
2a872bbd47 Merge pull request #3348 from VOREStation/zpipe-typo 
Fix typo in zpipe proc name.
 2017-04-22 20:22:34 -05:00
Atermonera
3f1194696a Brain type is shown on all records 2017-04-22 18:18:31 -07:00
Mechoid
fc924885eb Alphabetizes and Adds to the Borg Drink Synthesizer 2017-04-22 17:12:13 -07:00
Anewbe
79d9050476 Merge pull request #3311 from LorenLuke/Ventcrawl-fix 
Fixes ventcrawling for spiderbots/implants/etc.
 2017-04-22 17:21:04 -05:00
Leshana
23bcfbe28c Fix typo in zpipe proc name. 
* The proc obj/machinery/atmospherics/pipe/up/process was supposed to be obj/machinery/atmospherics/pipe/zpipe/process.
* Also changed hard coded integers to use constants while I was editing the file anyway.
 2017-04-22 17:05:20 -04:00
Anewbe
09deafb761 Merge pull request #3334 from Cerebulon/xenoheadgear 
Adds/Ports unique Rig Suit and Mask sprites for Unathi and Tajara
 2017-04-22 09:37:40 -05:00
Anewbe
04971fcbb4 Merge pull request #3346 from VOREStation/cable-directions 
Port multi-z cable improvements from Baystation
 2017-04-22 09:36:56 -05:00
Anewbe
2e9383d6ac Merge pull request #3339 from VOREStation/aro-pol-computericon 
Removes all the hard references to computer.dmi
 2017-04-22 09:36:40 -05:00
Anewbe
0207066256 Merge pull request #3332 from VOREStation/aro-pol-planets 
Controllerized Planets
 2017-04-22 09:36:04 -05:00
MagmaRam
cc3092859a Merge pull request #3344 from Anewbe/ion_holster 
Adds ion pistol to uplink, allows holstering
 2017-04-22 08:10:28 -05:00
Anewbe
28c4d5a4d8 Stimm recipe changed 2017-04-21 22:05:14 -05:00
Anewbe
a4d9db202b Allows ion pistol on the belt. 2017-04-21 19:24:06 -05:00
Yoshax
ec5cb4d950 Does Aronai things 2017-04-22 00:57:14 +01:00
Leshana
30d2f16b04 Replace color macros and stream operator with style and to_chat 2017-04-21 11:22:08 -04:00
comma
f614de8387 Updates cable construction 
FOrgot to update it to new direction whoops.
Also makes powernet connectino proc for cables multiz aware.
Port of: https://github.com/Baystation12/Baystation12/pull/15940
 2017-04-21 11:22:07 -04:00
comma
5f2d23fbd7 Makes cable use BYOND directions 
Instead of 11,12 they use 32,16 for DOWN,UP
Merges multiz handling into main logic
Port of: https://github.com/Baystation12/Baystation12/pull/15907
 2017-04-21 11:22:07 -04:00
Neerti
151ffe0038 Merge pull request #3291 from Anewbe/carp_lag 
Kills carp lag
 2017-04-20 23:42:29 -04:00
Anewbe
59a19f7197 Merge pull request #3330 from VOREStation/footstep-sounds 
Implements footstep sound system and adds sounds to various floor types.
 2017-04-20 21:10:28 -05:00
Anewbe
e17eccae93 Adds ion pistol to uplink, allows holstering 2017-04-20 20:04:21 -05:00
Neerti
31724dbb5a Should fix a holser runtime. 2017-04-20 19:55:29 -04:00
OrbisAnima
3efabaf2ab Added 3 new crates to cargo: 
Recreation: - Recreational Restraints, all the kind of stuff you might need to restrain someone but still showing you care, whip included.
Science: - Dangerous Predator Crate, contains a random common predator for science analisys, a system that might come in the future!
(Contraband) Extremely Dangerous Predator Crate, Contains a random yet quite mortal predator, for analiisys only by the bravest or fooliest people in the crew.
 2017-04-20 20:48:27 -03:00