cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 01:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,538 Commits 2 Branches 1 Tag
32677fbb35e7f91ce60e5f1c6bc1a1f6b24bd03d
Commit Graph

30808 Commits

Author SHA1 Message Date
Atermonera
32677fbb35 Telecomms fixes (#7257) 
* Fixes ERT and Merc Tcomms
Transit Relay can actually hear the transit z-level

* Resolves conflicts, makes sure normal radio works on centcomm Z
 2020-06-12 22:35:58 -07:00
Leshana
3c31b90bff Fix loading of history on connect. 
The for loop that used to do it loaded the wrong messages.
New method calculates correctly and also doesn't spend time loading from database if we're going to throw it away.
 2020-06-06 15:17:09 -04:00
Leshana
ddd2fc53bd Check vchat loaded flag before attempting to call putmessage 2020-06-06 15:16:59 -04:00
Atermonera
52d9199617 Merge pull request #7271 from VOREStation/Arokha/parcel 
fixes small package examination
 2020-06-06 11:46:22 -07:00
Atermonera
62e08c5414 Merge pull request #7270 from VOREStation/Arokha/lavablowup 
Prevents lava from being blown up
 2020-06-06 11:46:07 -07:00
Atermonera
4cb6cc8b24 Merge pull request #7269 from VOREStation/Arokha/eristweaks 
Add airless versions of some Eris floors, tweak layers
 2020-06-06 11:45:32 -07:00
Killian
99523da4f7 Vintage Voidsuits Expansion (#7266) 
* Vintage Voidsuits Expansion

* Update suit_storage_unit.dm

* small desc updates

* variant/cycler tweaks
 2020-06-06 11:40:20 -07:00
Atermonera
9d1f71214a Merge pull request #7265 from VOREStation/Arokha/metaglass 
Allow reagents to have specific metaglass icon files
 2020-06-06 11:35:55 -07:00
BillyBangles
cb8a366113 Adds marble floor tiles and crafting recipe (#7264) 
* Adds marble floor tiles and crafting recipe

* swaps screwdriver removal for crowbar

* changelog fix
i'm a silly goose and forgot to edit out the screwdriver bit
 2020-06-06 11:35:35 -07:00
Atermonera
32f9e43f27 Merge pull request #7211 from VOREStation/Arokha/talks 
Talking, and other bugs
 2020-06-06 11:33:34 -07:00
Atermonera
c76ce99a4d Adds proc to replace default cells with high cap on machinery (#7241) 
* Adds proc to replace default cells with high cap on machinery

* *grumbling*
 2020-06-04 19:37:53 -07:00
Atermonera
0c78a71226 Fixes runtimes related to mmi_holder and defib_timer (#7237) 
Fixes runtime in life.dm,1831: undefined proc or verb /obj/item/organ/internal/mmi_holder/robot/tick defib timer().
Fixes runtime in defib.dm,511: undefined variable /obj/item/organ/internal/mmi_holder/robot/var/defib_timer
 2020-06-04 19:37:29 -07:00
Atermonera
69a5424abf Merge pull request #7263 from VOREStation/Arokha/standrag 
Remove bloodspray when pulling standing people
 2020-06-04 19:26:13 -07:00
Atermonera
1bcb649378 Merge pull request #7262 from lolman360/master 
fixes hybrid crowbars
 2020-06-04 19:25:35 -07:00
Atermonera
2596679bf4 Merge pull request #7261 from Cerebulon/rotationpart2 
Another Lesser Rotation
 2020-06-04 19:24:34 -07:00
Atermonera
b81d8ae24a Merge pull request #7256 from VOREStation/Arokha/offtherails 
Tweak railguns, add flechette pistol
 2020-06-04 19:23:42 -07:00
Killian
368315b4db Species Vars Extension (#7249) 
* species var extension v1

* Update carbon.dm

* sve v1.2

* sve v1.2a

* Update carbon.dm

* Update carbon.dm

* ain't no party like a bitflag party

* assorted tweaks and refactoring

* Update carbon.dm

* further duration & effect tweaks
 2020-06-04 16:51:52 -07:00
Aronai Sieyes
dcf09397b4 Various talking fixes/improvements 2020-06-03 10:10:55 -04:00
Kenzie
78957fd3cb fixes small package examination 2020-06-01 20:56:24 -04:00
Rykka Stormheart
8235afb3ae Merge branch 'master' into shep-dev-multicam 2020-06-01 14:23:03 -04:00
Aronai Sieyes
c4c98a7046 Prevents lava from being blown up 2020-06-01 13:42:57 -04:00
Arokha Sieyes
8b0effcaa9 Be really specific about turf decal layers 2020-06-01 12:55:35 -04:00
Arokha Sieyes
8eea54dc3b Airless hull and platings 2020-06-01 12:55:24 -04:00
Atermonera
b30a66d2af Merge pull request #7251 from VOREStation/Arokha/solgov 
Fix solgov icons
 2020-05-31 15:59:12 -07:00
Atermonera
e53dc1539b Merge pull request #7247 from VOREStation/Arokha/erisfloors 
Port various auto-decorating floors from Eris
 2020-05-31 15:37:51 -07:00
Aronai Sieyes
1815113c51 Simplify is_plating() 2020-05-31 16:55:13 -04:00
Atermonera
58600b7c72 Merge pull request #7248 from VOREStation/Arokha/stacksploit 
Fix medical stack exploit
 2020-05-30 23:18:14 -07:00
Atermonera
14872117b8 Merge pull request #7246 from VOREStation/vplk-overmap-pixel-movement 
[PORT] Overmap Ship Pixel Movement
 2020-05-30 21:31:09 -07:00
Atermonera
938a226b2b Merge pull request #7243 from Mechoid/BlobLoop 
Blob Infinite Loop Fix
 2020-05-30 21:22:47 -07:00
Atermonera
848b072368 Merge pull request #7240 from Cyantime/whispdoubles 
Fix doublewhispering
 2020-05-30 21:21:33 -07:00
Atermonera
59aeedd334 Merge pull request #7231 from VOREStation/Arokha/vpnwarn 
Warn VPN connectors better
 2020-05-30 21:20:01 -07:00
Atermonera
bf946757ec Merge pull request #7227 from VOREStation/Arokha/gpsruntime 
Add safety to GPSes to avoid runtimes
 2020-05-30 21:19:41 -07:00
Atermonera
79e7c12e98 Merge pull request #7219 from VOREStation/Arokha/sinks 
Fix sinks washing things at a distance
 2020-05-30 21:19:19 -07:00
Atermonera
55e12aad7b Merge pull request #7210 from VOREStation/vplk-static-power 
[PORT] Static Machinery Power
 2020-05-30 21:18:27 -07:00
Arokha Sieyes
723d2afcec Allow reagents to have specific metaglass icon files 2020-05-30 16:59:09 -04:00
Aronai Sieyes
e32762fee9 Merge branch 'master' into Arokha/offtherails 2020-05-30 16:27:44 -04:00
Leshana
677c6a1f71 Cleanup proc return statement. 2020-05-30 16:24:30 -04:00
Rykka
536b5a709f Fix indentation error + inserted spaces 2020-05-30 07:01:20 -04:00
Rykka Stormheart
9917f31031 Merge branch 'master' into shep-dev-upstream-screenport 2020-05-30 06:54:08 -04:00
Rykka
021d0aedd1 Changes spawn to addtimer CALLBACK, and changes a usr << to to_chat 2020-05-30 06:40:00 -04:00
Atermonera
bb08266599 Merge pull request #7215 from KasparoVy/faster-faster-yet-faster 
Streamline (Facial) Hair & Marking Character Customization, Port color_square to Clean Prefcode
 2020-05-29 23:05:22 -07:00
Atermonera
82eb97ca7a Merge pull request #7225 from lbnesquik/Kath-Vending-Tweak 
Increase the amounts of SNACKS and cigarettes in vending machines.
 2020-05-29 22:57:49 -07:00
Novacat
cbe0ce9c84 Fixes accessory slots 2020-05-30 01:54:38 -04:00
Atermonera
210daadda5 Merge pull request #7218 from VOREStation/Arokha/traps 
Traps don't get weird with removed limbs
 2020-05-29 22:54:15 -07:00
KasparoVy
3719351856 Let em know 
Thanks Atermonera
 2020-05-30 01:49:59 -04:00
KasparoVy
b4ef771626 Ports color_square from Paradise to Clean up Prefcode & Fix Alignment 
Fixes an alignment issue with inline tables nested inside table rows & cleans up code.
 2020-05-30 01:41:42 -04:00
Aronai Sieyes
07dd85043b Make mapped in decals above auto-floor decals 2020-05-29 20:52:42 -04:00
Aronai Sieyes
577a18f35e Remove bloodspray when pulling standing people 2020-05-29 15:56:49 -04:00
Aronai Sieyes
58421727da Port Eris' extensive floor blending system 2020-05-29 14:01:40 -04:00
Aronai Sieyes
c0c42b053b Allow plating operations on 'floored' plating 2020-05-28 23:05:01 -04:00