Commit Graph

6793 Commits

Author SHA1 Message Date
Arokha Sieyes 306a484b48 U_I Phase 2.4: Storage cleanup 2018-03-08 19:34:00 -05:00
Arokha Sieyes 53a185f838 U_I Phase 2.0: Code cleanup
Removing calls to update_icons_layers and the like, stubbing them to help track down future calls.
2018-03-08 19:33:44 -05:00
Arokha Sieyes 62e0c122fa U_I Phase 1.4: More preview fixes, not done yet 2018-03-08 19:31:56 -05:00
Arokha Sieyes 3be602dece U_I Phase 1.3: Previews are broken, so that's a thing 2018-03-08 19:31:55 -05:00
Arokha Sieyes 2f433c9ea9 U_I Phase 1.2: Something is broken somewhere 2018-03-08 19:31:54 -05:00
Arokha Sieyes 94c2110f27 U_I Phase 1.1: Fix phase 1 bugs
Softsuits making your clothes disappear, PDAs in ID slot making you double
2018-03-08 19:31:54 -05:00
Arokha Sieyes aa9ec19118 U_I Phase 1.0: First consolidation pass 2018-03-08 19:31:43 -05:00
Arokha Sieyes 4538a6859f POLARIS: Use drop_location() for things 2018-03-08 13:03:09 -05:00
Verkister 8cffc2298c Readies our borg stuff for next sync fixes.
-Fixes the default module icon missing from our _vr.dmi
-Makes our custom modules enable ui_style_vr to pull the hud icon from our dmi instead.
-Makes relogging etc not revert to default ui file if ui_style_vr is enabled for the borg.
-Moves the clumsy VS edit borg reset stuff to a more appropriate place.
-Adds the recently fixed attack anim offset fix and the ui_style_vr to the reset module.
2018-03-07 11:29:46 +02:00
MisterLayne 21c9cd0a05 fixes code, and adds changelog (hope I did it right) 2018-03-06 20:52:55 -05:00
Leshana 3a94638dbf Merge pull request #3156 from Verkister/wideborgs
Small wide/dog borg tweaks/fixes
2018-03-06 09:43:32 -05:00
Atermonera 81e5ea9536 Ater poi3 (#4968)
* Supply Drop POI

* Ration Cache

* BlastMine1

* Supply Drop 2

* Tweaks, package bomb detonators can be re-used

* Changelog

* Missed some spots while cherry-picking

* Merge branch master (I hope this works)

* Appeases travis

* Missed a spot
2018-03-05 19:55:27 -06:00
Aronai Sieyes 10a9793fdb Merge pull request #3177 from aztectornado/syringe-case
Adds quickdraw objects and syringe cases
2018-03-05 18:36:27 -05:00
Aronai Sieyes efd96ea7c2 Merge pull request #3178 from VOREStation/aro-sync
Polaris Sync
2018-03-05 18:26:24 -05:00
Aztectornado 2d0872b524 Adds quickdraw objects and syringe cases 2018-03-04 18:58:34 -06:00
Atermonera 6402538f3c Weather reports won't crash when planet controller dies 2018-03-04 15:41:55 -08:00
Aronai Sieyes 96d085cb42 Merge pull request #3154 from Heroman3003/language-upgr-fix
Fixed Language upgrade not being removed after being applied
2018-03-04 12:40:52 -05:00
Arokha Sieyes 68a5fabe11 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00
BillyBangles 6ff1f1b165 fixes #4992 (#4995)
i'm good at this i swear
2018-03-02 18:24:51 -08:00
Belsima c2be6a7575 More standardized grammar (#4977) 2018-03-02 18:24:15 -08:00
Belsima 84d66c51df DNA injectors cause cloneloss. (#4958) 2018-03-01 12:49:11 -08:00
Anewbe 524c9aa5db Removes translators from the loadout (#4942) 2018-03-01 12:00:37 -08:00
Anewbe ee9061e80f Merge pull request #4982 from Cyantime/tinypda
Fixes two minor PDA cart issues.
2018-03-01 11:09:26 -06:00
Anewbe dda4b68e4d Merge pull request #4981 from VOREStation/pol-radio-drama
Adds 'Intercom Convo' verb
2018-03-01 10:32:30 -06:00
Verkister 0f291cf319 Merge branch 'master' into wideborgs 2018-03-01 08:20:31 +02:00
Arokha Sieyes 3004093a50 Make syringe reuse a bad idea
Because now it can infect limbs and transfer viruses
2018-02-28 20:03:18 -05:00
Anewbe 36540182df Merge pull request #4965 from Belsima/techy
Adds illegal and other tech to some implants.
2018-02-28 14:17:17 -06:00
BillyBangles 2ab9bfe79b Turns the station into 420-station 13. (#4971)
* adds rolling paper and joints

F O U R T W E N T Y   B L A Z E   I T

* adds joint sprites

(they're pretty bad though)

* adds rolling paper box, adds papers to cig vendors

* c h a n g e l o g

smoke
weed
every
day
2018-02-28 14:16:42 -06:00
Anewbe 2bcad10584 Merge pull request #4974 from VOREStation/pol-plushsshhhshsh
Ports Plenty Pretty Paradise Plushes
2018-02-28 11:19:55 -06:00
Mechoid 5dc7189cf7 Various Loot Pile and Dungeon objects Stage Uno (#4975)
* Loot Piles

* Mecha Loot Piles, Random Tool Spawners

* Fix Random Spawners, don't use Fiftyspawners
Fix Fiftyspawners
2018-02-28 11:18:44 -06:00
Verkister 9eeb4f0f65 Small wide/dog borg tweaks/fixes
-Adds a new var to specify nonstandard borg sprite sizes. No longer dogborg exclusive.
-Makes the dogborg var usable for standard sizes as well (for the special features like rest poses and gun/gut overlays)
-Makes the borg reset module reset the forementioned vars.
-Excludes wideborg from the standard size polaris/vore vr_sprite_check to avoid unintended default file reverts.
2018-02-28 10:42:40 +02:00
Heroman3003 859483c6cf maybe fix? 2018-02-28 17:40:13 +10:00
Heroman3003 67105d921c Fixed Language upgrade not being removed after being applied 2018-02-28 16:46:53 +10:00
Atermonera dfe41e3250 Made a <br> into a <brr> 2018-02-27 21:42:41 -08:00
Cyantime ec5f2543d7 Fixes two minor PDA cart issues. 2018-02-27 22:45:09 -05:00
Aronai Sieyes 2935ec1ac8 Merge pull request #3149 from VOREStation/aro-sync
Polaris Sync
2018-02-27 21:48:52 -05:00
Aronai Sieyes dcc02e5090 Merge pull request #3153 from VOREStation/aro-convo
Adds 'Intercom Convo' verb
2018-02-27 21:48:39 -05:00
Arokha Sieyes 3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
2018-02-27 21:27:35 -05:00
Arokha Sieyes 43065846a4 Adds 'Intercom Convo' verb
Allows an admin to 'schedule' up to 20 messages to play on the radio.
2018-02-27 21:24:22 -05:00
Arokha Sieyes 7aa5ca479a Adds 'Intercom Convo' verb
Allows an admin to 'schedule' up to 20 messages to play on the radio.
2018-02-27 21:17:47 -05:00
Atermonera d345a60ad7 Merge pull request #4960 from Nerezza/Shutter-tape
Makes tape appliable to hazard shutters just like airlocks
2018-02-27 17:45:11 -08:00
Arokha Sieyes 1afa7a10f5 Further toy tweaks 2018-02-27 16:00:32 -05:00
Arokha Sieyes 6d165a5059 Belsima toy word changes 2018-02-27 16:00:32 -05:00
Arokha Sieyes 63fd767102 Rebased deconflicted plush additions 2018-02-27 16:00:16 -05:00
Belsima a578eeeb85 plushie love (#4964)
* plushie love

* Kiss2

* good god why

* you can make severed heads kiss now :)

* [I] first

* [I] first2

* comma

* comma
2018-02-27 14:49:06 -06:00
Anewbe cf79159b31 Merge pull request #4967 from Atermonera/umbreload
Adds umbrellas to loadout, for 3 points
2018-02-27 14:48:04 -06:00
Schnayy 36236e1883 Sivian Western Sprite Pack (#4970)
* Adds: flamenco dress, bustle dress, cowboy duster, sheriff badge, tiny cowboy hat. To be added: 2 pairs of cowboy boots, stick horse.

* Adds 2 cowboy boots and a stick horse. yeehaw.

* Attempting to squash conflict that was caused by one of my OWN prs. For shame.

* attempting to fix conflict ft. anewbe
2018-02-27 14:24:20 -06:00
Arokha Sieyes f04c58f202 VS: Rewrites basically all of how bellies work
And cleans up a ton of stuff.
2018-02-27 13:29:45 -05:00
elgeonmb 8c9c99f817 Adds new languages (#4961)
* langs

* humanity first

* humanity first but for real this time

* i know how to spell good

* grumbles
2018-02-26 21:21:50 -06:00
atermonera 48c6161c4d Adds umbrellas to loadout, for 3 points 2018-02-26 12:39:56 -08:00