cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 05:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,701 Commits 9 Branches 26 Tags
c06339487a61624324e80308f27d3ebcc68b4bd8
Commit Graph

9436 Commits

Author SHA1 Message Date
Aronai Sieyes
c06339487a Merge branch 'master' into upstream-merge-5335 2018-06-16 17:43:55 -04:00
Aronai Sieyes
abd67bb983 Merge pull request #3889 from VOREStation/upstream-merge-5282 
[MIRROR] Allows AIs to produce and control maint/construction/mining drones.
 2018-06-16 10:51:20 -04:00
Aronai Sieyes
dd504699e0 Merge pull request #3875 from Little-119/MSTA 
Makes synths able to taste again
 2018-06-16 10:47:37 -04:00
Mechoid
9b00166de0 Allows AIs to produce and control maint/construction/mining drones. (#5282) 
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.
 2018-06-15 20:15:03 -04:00
Verkister
ac94d82ba1 Couple VS edit fixes. 
-Fixes borg sleepers nuking passengers on cryo despawn.
-Fixes mimics dropping their guts.
 2018-06-15 10:24:39 +03:00
Spades
6f30b149cd Merge pull request #3351 from Screemonster/greenfingers 
alraune species
 2018-06-13 18:33:07 -04:00
Little-119
fa2da1ead6 Makes synths able to taste again 
Comments out the code added by commit 04ea07fb02

Since Aronai said he made synths able to taste a year ago, and synths not being able to taste was a goof
 2018-06-13 16:30:49 -04:00
Atermonera
7cd1442e8f Ports some Bay hair code 2018-06-12 03:43:57 -04:00
deathride58
d78a1ef8ed And here, too! the /human subtype completely overrides the /atom/movable examine() 2018-06-09 07:05:53 -04:00
Aronai Sieyes
632300ceeb Merge pull request #3831 from VOREStation/upstream-merge-5327 
[MIRROR] Changes "Setup Character" to "Character Setup"
 2018-06-04 17:27:47 -04:00
Anewbe
d755dfd2b8 Merge pull request #5327 from Cameron653/patch-2 
Changes "Setup Character" to "Character Setup"
 2018-06-04 16:08:13 -04:00
Atermonera
76c8e20e2a Merge pull request #5301 from Anewbe/more_merc_mob_things 
Adds armor to certain mobs, mercs have knives
 2018-06-03 03:58:47 -04:00
Aronai Sieyes
b0f21a938b Merge pull request #3822 from VOREStation/upstream-merge-5305 
[MIRROR] Prevent autosay() from creating/deleting AIs
 2018-06-02 19:03:02 -04:00
Anewbe
7528ac54fb Merge pull request #5305 from VOREStation/pol-autosay 
Prevent autosay() from creating/deleting AIs
 2018-06-02 12:47:27 -04:00
pontifexminimus2
3ea860ae99 Typo 
Oops, that doesn't belong there...
 2018-06-02 18:32:42 +02:00
pontifex2
2f3fa81425 Assorted Zorren changes to make them in line with the lore I set up. 
Changed their blood colour to a blue.
Replaced their native language Siik (?? This is the Tajaran language) with Terminus, a Polaris language currently whitelisted.
Disabled the whitelist for Terminus.
Changed the description for Terminus so it's actually the Zorren's language.
 2018-06-02 18:28:44 +02:00
Aronai Sieyes
e04212d616 Merge pull request #3763 from Ketrai/master 
Adds Fennix mob
 2018-06-01 10:49:02 -04:00
Anewbe
25a6fb865a Merge pull request #5313 from VOREStation/pol-joblogmove 
Move character join log statement
 2018-05-31 21:33:31 -04:00
Aronai Sieyes
1c46d7e501 Merge pull request #3750 from fludd12/splat 
Prometheans melt on death.
 2018-05-31 13:11:02 -04:00
Aronai Sieyes
d96f4de071 Merge pull request #3775 from Novacat/nova-heterochromia 
Adds Heterochromia Marking
 2018-05-31 13:08:12 -04:00
Aronai Sieyes
f0f03c1d6d Merge pull request #3788 from VOREStation/aro-issue-3787 
Makes dogborgs spawn with bellies again
 2018-05-30 02:59:09 -04:00
Arokha Sieyes
309a28911a Makes dogborgs spawn with bellies again 
Fixes #3787
 2018-05-28 21:02:58 -04:00
Arokha Sieyes
8fdb1d3191 Rat code cleanup 
Fixes a compile warning and some other things (reduces view range, and how often they scan to be more like Ian)
 2018-05-28 17:35:50 -04:00
Verkister
1222e5d0d6 Merge branch 'master' into hangryrat 2018-05-28 15:08:53 +03:00
Arokha Sieyes
2d89d63c09 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme
 2018-05-27 19:26:12 -04:00
Unknown
c02a0973ff Adds Heterochromia Markings 
Supports most species, with exception of Teshari, Skrell, and Vox.
 2018-05-27 18:40:04 -04:00
Atermonera
c7aad71147 Merge pull request #5295 from Anewbe/suit_sprite_issues 
Spacesuits are now in their own dmi file
 2018-05-26 15:25:58 -07:00
Atermonera
53db96d193 Merge pull request #5300 from Anewbe/more_runtimes 
Adds a number of accessory related null checks
 2018-05-26 15:23:03 -07:00
Ketrai
82e9c30aa7 Travis? 2018-05-26 22:51:05 +02:00
Ketrai
794db16782 Makes fennix attacks super weak. 2018-05-26 22:42:38 +02:00
Anewbe
13b205ee14 Merge pull request #5297 from Mechoid/FixBorgSynthesizers 
Fix Engi Material Synths
 2018-05-26 11:52:59 -05:00
Ketrai
8fb3bd6891 Adds Fennix code 
Squelch
 2018-05-26 15:45:11 +02:00
Mechoid
917c7b71a5 Box of Things for Events and the Future MK1 (#5281) 
* Lots of Stuff for Events

* Adds changelog.

* Review & QOL
 2018-05-25 16:26:31 -07:00
Atermonera
5957251397 Merge pull request #5280 from Anewbe/poi_tweaks 
Merc PoI Tweaks
 2018-05-25 10:56:40 -07:00
Anewbe
d8f1069689 Adds a number of accessory related null checks 2018-05-25 12:29:33 -05:00
Arokha Sieyes
6b42df0685 Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018 
# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-05-25 13:23:47 -04:00
Mechoid
a4d7699c0f Fix Engi Synths 2018-05-24 22:08:52 -07:00
Anewbe
841837191c Merge pull request #5296 from Anewbe/armor_fix 
Fixes a runtime with armor checks
 2018-05-24 18:39:55 -05:00
Anewbe
beb88f7b7d Fixes a runtime with armor checks 2018-05-24 18:38:57 -05:00
Aronai Sieyes
b1b9090430 Merge pull request #3757 from VOREStation/aro-cblind 
Fix vulp colorblindness being mono instead
 2018-05-24 19:33:24 -04:00
Arokha Sieyes
22bf8684e5 Fix vulp colorblindness being mono instead 
Fixes #3740
 2018-05-24 19:14:57 -04:00
Anewbe
1e05e23a78 Spacesuits are now in their own dmi file 2018-05-24 17:45:45 -05:00
Anewbe
49cf32f3b0 Fixes examine bugs 2018-05-24 17:08:45 -05:00
Aronai Sieyes
abecdfe3fa Merge pull request #3499 from Verkister/engibork 
New dogborg + Recycling update + Wet Dogborgs update
 2018-05-24 17:45:08 -04:00
fludd12
e64e4ed0c8 Prometheans melt on death, and can now be revived. 2018-05-24 07:08:46 -04:00
Anewbe
0647b05cd3 Swapping hands cancels zoom 2018-05-21 23:17:46 -05:00
Anewbe
6c7cf99236 Adds PoI specific merc mobs and turrets 2018-05-20 17:31:37 -05:00
Atermonera
4c1b43c765 Merge pull request #5265 from Anewbe/examine_grammar_1 
Grammar tweak
 2018-05-17 11:41:42 -07:00
Leshana
d53f405fb0 Merge pull request #3709 from VOREStation/aro-sayreflect 
Message send failure reflection
 2018-05-16 20:46:19 -04:00
Atermonera
37047ff895 typo (#5266) 
* typo

* Update mob.dm
 2018-05-16 19:27:23 -05:00