cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,869 Commits 8 Branches 26 Tags
13dec153ffdbbb15e29dc4b292169d4928caa5a4
Commit Graph

19978 Commits

Author SHA1 Message Date
Aronai Sieyes
13dec153ff Merge pull request #3110 from VOREStation/Cameron653-patch-2 
Removed unused fat genetics movement code
 2018-02-24 11:16:18 -05:00
Leshana
30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23 
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-02-23 21:55:42 -05:00
Leshana
4457c2ffd2 Merge pull request #3111 from VOREStation/aro-say2 
say() safety check on client
 2018-02-23 18:06:59 -05:00
Arokha Sieyes
fc3aca384a say() safety check on client 
Spawn keeps it from destroying all say(), thankfully, but needs to be fixed.
 2018-02-23 15:56:16 -05:00
Cameron653
9bf341d199 Removed unused fat genetics movement code 
You can't get it in the game anyways w/o admin abuse. No reason to have an extra  if() check.
 2018-02-23 14:18:36 -05:00
Anewbe
63667c4a02 Merge pull request #4927 from VOREStation/pol-gun 
Fix mode_name on guns always being null
 2018-02-23 13:18:36 -06:00
Anewbe
b58b4fcfde Merge pull request #4928 from VOREStation/pol-join-order 
Create humans ON their spawn points
 2018-02-23 13:18:28 -06:00
Anewbe
328a7c54df Merge pull request #4926 from VOREStation/vplk-gas-turbine 
Make gas turbine constructable and operational
 2018-02-23 13:16:56 -06:00
Anewbe
849ef9a8d6 Merge pull request #4925 from VOREStation/vplk-tesla-grounding 
Tweak Tesla Grounding Rods
 2018-02-23 13:16:46 -06:00
Aronai Sieyes
210c16590a Merge pull request #3107 from VOREStation/aro-kinscoop 
SA's with hands can scoop mobs
 2018-02-23 00:22:38 -05:00
Aronai Sieyes
72335bb82b Merge pull request #3105 from VOREStation/aro-zshadfix 
Zshadows should be as invisible as their origin
 2018-02-23 00:07:19 -05:00
Aronai Sieyes
4f5a5bde0b Merge pull request #3106 from VOREStation/aro-invistweak 
Allow alteration of mob default see_invisible
 2018-02-22 23:56:43 -05:00
Arokha Sieyes
08c0a64fec SA's with hands can scoop mobs 2018-02-22 23:48:15 -05:00
Arokha Sieyes
ef18bc7ff1 POLARIS: Allow alteration of mob default see_invisible 2018-02-22 23:01:16 -05:00
Arokha Sieyes
54ae568b37 POLARIS: zshadows should be as invisible as their origin 2018-02-22 22:36:39 -05:00
Atermonera
7f12366cc8 Merge pull request #4862 from Anewbe/steals_more_armor 
Adds/steals more armor code, inventory changes
 2018-02-22 18:55:01 -08:00
Atermonera
4a0acb27f1 Merge pull request #4909 from Anewbe/two_handed_guns 
Ports more two-handed gun sprites from Bay
 2018-02-22 18:27:23 -08:00
Anewbe
d7b7a1be00 Merge pull request #4919 from AbbieFland/pai-communicator 
Fixed pAI communicator buttons.
 2018-02-22 20:26:50 -06:00
Atermonera
9993031500 Merge pull request #4917 from Anewbe/surgery_oversight 
Corrects an oversight with surgery and defibs
 2018-02-22 18:25:04 -08:00
Anewbe
0c75b3e634 Merge pull request #4916 from VOREStation/pol-hudfix 
Critters Can Crawl Carrying Client Constructs
 2018-02-22 19:19:28 -06:00
Arokha Sieyes
1720cd54f3 Create humans ON their spawn points 
Instead of moving them there later.
 2018-02-22 20:14:39 -05:00
Arokha Sieyes
3680b0382a POLARIS: Fix mode_name on guns always being null 2018-02-22 20:03:54 -05:00
Arokha Sieyes
9544074b50 POLARIS: Fix mode_name on guns always being null 2018-02-22 19:58:19 -05:00
Aronai Sieyes
2315541c22 Merge pull request #3096 from VOREStation/aro-imagecleanup 
Improve two image cleanups
 2018-02-22 19:35:42 -05:00
Aronai Sieyes
8080722399 Merge pull request #3097 from aztectornado/siren 
Adds Siren jumpsuit
 2018-02-22 19:32:09 -05:00
Leshana
a1bfd1fb46 Make gas turbine constructable and operational 
* Make gas turbine constructable, as well as modernizing its code. Borrowed some from /tg
* Converted the gas turbine control computer to nano ui.
 2018-02-22 15:43:38 -05:00
Leshana
364c0253dc Tweak Tesla Grounding Rods 
Grounding rods that are anchored can be struck two turfs farther away than unanchored.  This makes it possible to leapfrog towards a tesla because an unanchored one can be protected in the "shadow" of the anchored one.
 2018-02-22 15:32:31 -05:00
Aronai Sieyes
db62300a17 Merge pull request #3078 from Screemonster/moremeramods 
Adds "monster tamer" drink, plus some chimera tweaks.
 2018-02-22 13:15:40 -05:00
Aronai Sieyes
6fc64be1a8 Merge pull request #3091 from VOREStation/Cameron653-patch-1 
Adds a toggle to the bluespace jumpsuit
 2018-02-22 12:33:16 -05:00
Aztectornado
105f986db1 Adds Siren jumpsuit 2018-02-22 06:00:41 -06:00
Anewbe
8c5dc66a13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor 2018-02-21 23:33:17 -06:00
Mechoid
a47ce58f0a Merge pull request #4905 from Anewbe/zheng-hu 
Zheng Hu Improvements
 2018-02-21 21:19:04 -08:00
Mechoid
1de47d364c Merge pull request #4899 from Anewbe/rad_anomaly 
Weakens the random mining radbursts
 2018-02-21 21:17:59 -08:00
Anewbe
fa9f55d944 Merge pull request #4912 from Verkister/patch-5 
Small regenerate_icons tweak.
 2018-02-21 23:07:23 -06:00
Anewbe
01ae959020 Merge pull request #4865 from Atermonera/umbrella 
Adds umbrellas
 2018-02-21 23:06:44 -06:00
Arokha Sieyes
d9dc7c557d Improve two image cleanups 2018-02-21 23:23:02 -05:00
Abbie Fland
47b45eb1f8 Fixed pAI communicator buttons. 
While pAI could open their communicator, they were unable to interact
with any of the buttons in its UI. This adds the UI of their own
built-in communicator to the other two UIs they were already explicitly
allowed to access (those of their own radio and their own interface).
 2018-02-22 03:17:03 +00:00
Anewbe
14336e7985 Corrects an oversight with surgery and defibs 2018-02-21 18:57:51 -06:00
Arokha Sieyes
6da9eb5451 Fix HUD creation and ventcrawling 2018-02-21 17:47:19 -05:00
Aronai Sieyes
4917222a6b Merge pull request #3086 from Verkister/backgrounds 
Preview background fixes and additions.
 2018-02-21 17:17:50 -05:00
Anewbe
21592606b7 Merge pull request #4898 from Mechoid/Mining_Optimization 
Mining Bag / Box Speedification
 2018-02-21 16:15:16 -06:00
Cameron653
f15195cded Whoops 2018-02-21 16:50:26 -05:00
BillyBangles
5486edf567 Adds various cabin-related things. (#4888) 
* adds fireplace, makes bonfire generate heat

kinda, anyways

* adds sifwood tiles, fixes old blue carpets

old blue carpets are now known as "teal carpets." they still come in the
carpet crate from cargo.

* lets you dig up tree stumps with shovels

* changelogs in the house

* adds a delay to digging up stumps

digging up stumps is easier said than done
 2018-02-21 15:45:01 -06:00
Cameron653
031c30d06d Adds a toggle to the bluespace jumpsuit 2018-02-21 16:43:57 -05:00
Anewbe
dfdafddaa9 Merge pull request #4897 from VOREStation/pol-analfix 
Fix health analyzer names
 2018-02-21 10:03:09 -06:00
Anewbe
a6653bf00a Merge pull request #4896 from VOREStation/pol-qdels 
Fix several Destoy()s
 2018-02-21 10:01:23 -06:00
Verkister
d456a6ef8a Small regenerate_icons tweak. 
Alright the previous attempt didn't quite work as intended, sorry for that.
Anyway I was checking out what sorta things happen to use the legacy support regenerate_icons human proc and found out some of them had connections to circumstances I've heard of causing trouble. Found out all the update calls included in it came with a 0 to prevent each call from doing update_icons on its own before the intended calls at the bottom of the bunch, except for one, UpdateDamageIcon, which also did have the same (var/update_icons=1) skip expectation as the others, causing premature dupe updates in regenerate_icons.
 2018-02-21 12:48:52 +02:00
Atermonera
4a5be308f3 Merge pull request #4893 from Anewbe/attacktext 
Slimes should no longer /list you.
 2018-02-21 00:35:38 -08:00
Atermonera
4b7d67a2b0 Merge pull request #4876 from Anewbe/dangerous_animals 
Simple mobs respect armor pen, sharp, and edge
 2018-02-21 00:34:24 -08:00
Anewbe
947dc94491 Merge pull request #4892 from Verkister/backgrounds 
Preview background additions and a fix.
 2018-02-21 02:03:15 -06:00