03f3d9b5c1
Merge branch 'virgoMaster' into virgoPull
2018-03-12 18:41:26 -07:00
e129f03b42
Gives RD explorer comms
2018-03-10 16:52:52 -06:00
2c9bdf3ae4
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -05:00
54cf9636ec
Merge pull request #3189 from Verkister/moreborgostuff
...
Readies our borg stuff for next sync fixes.
2018-03-10 15:01:04 -05:00
4538a6859f
POLARIS: Use drop_location() for things
2018-03-08 13:03:09 -05:00
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
3a94638dbf
Merge pull request #3156 from Verkister/wideborgs
...
Small wide/dog borg tweaks/fixes
2018-03-06 09:43:32 -05:00
10a9793fdb
Merge pull request #3177 from aztectornado/syringe-case
...
Adds quickdraw objects and syringe cases
2018-03-05 18:36:27 -05:00
efd96ea7c2
Merge pull request #3178 from VOREStation/aro-sync
...
Polaris Sync
2018-03-05 18:26:24 -05:00
2d0872b524
Adds quickdraw objects and syringe cases
2018-03-04 18:58:34 -06:00
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
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
6ff1f1b165
fixes #4992 ( #4995 )
...
i'm good at this i swear
2018-03-02 18:24:51 -08:00
c2be6a7575
More standardized grammar ( #4977 )
2018-03-02 18:24:15 -08:00
84d66c51df
DNA injectors cause cloneloss. ( #4958 )
2018-03-01 12:49:11 -08:00
524c9aa5db
Removes translators from the loadout ( #4942 )
2018-03-01 12:00:37 -08:00
ee9061e80f
Merge pull request #4982 from Cyantime/tinypda
...
Fixes two minor PDA cart issues.
2018-03-01 11:09:26 -06:00
dda4b68e4d
Merge pull request #4981 from VOREStation/pol-radio-drama
...
Adds 'Intercom Convo' verb
2018-03-01 10:32:30 -06:00
0f291cf319
Merge branch 'master' into wideborgs
2018-03-01 08:20:31 +02:00
3004093a50
Make syringe reuse a bad idea
...
Because now it can infect limbs and transfer viruses
2018-02-28 20:03:18 -05:00
36540182df
Merge pull request #4965 from Belsima/techy
...
Adds illegal and other tech to some implants.
2018-02-28 14:17:17 -06:00
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
2bcad10584
Merge pull request #4974 from VOREStation/pol-plushsshhhshsh
...
Ports Plenty Pretty Paradise Plushes
2018-02-28 11:19:55 -06:00
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
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
859483c6cf
maybe fix?
2018-02-28 17:40:13 +10:00
67105d921c
Fixed Language upgrade not being removed after being applied
2018-02-28 16:46:53 +10:00
dfe41e3250
Made a <br> into a <brr>
2018-02-27 21:42:41 -08:00
ec5f2543d7
Fixes two minor PDA cart issues.
2018-02-27 22:45:09 -05:00
2935ec1ac8
Merge pull request #3149 from VOREStation/aro-sync
...
Polaris Sync
2018-02-27 21:48:52 -05:00
dcc02e5090
Merge pull request #3153 from VOREStation/aro-convo
...
Adds 'Intercom Convo' verb
2018-02-27 21:48:39 -05:00
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
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
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
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
1afa7a10f5
Further toy tweaks
2018-02-27 16:00:32 -05:00
6d165a5059
Belsima toy word changes
2018-02-27 16:00:32 -05:00
63fd767102
Rebased deconflicted plush additions
2018-02-27 16:00:16 -05:00
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
cf79159b31
Merge pull request #4967 from Atermonera/umbreload
...
Adds umbrellas to loadout, for 3 points
2018-02-27 14:48:04 -06:00
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
f04c58f202
VS: Rewrites basically all of how bellies work
...
And cleans up a ton of stuff.
2018-02-27 13:29:45 -05:00
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
48c6161c4d
Adds umbrellas to loadout, for 3 points
2018-02-26 12:39:56 -08:00
d1aa9affe4
Merge pull request #4953 from Schnayy/trinketbox
...
Trinket box
2018-02-26 10:04:14 -06:00
59e07f941e
Implant Tech
2018-02-26 09:23:18 -05:00
413e832825
Makes tape appliable to hazard shutters just like airlocks
...
Clicking hazard shutters with tape will tape them up like airlocks, instead of opening them (if you have the access to).
2018-02-25 14:46:32 -06:00
5cd5eaaad8
Merge pull request #4949 from Nerezza/Floor-fixes
...
Flooring fixes
2018-02-25 12:39:33 -06:00
a42d7ecdb4
Merge pull request #4944 from VOREStation/pol-matweak
...
Tweak weird MA override
2018-02-25 12:38:58 -06:00
460202cb6e
Puts the trinket box back in after I had to comment it out in the gift vendor pr from conflict.
...
https://user-images.githubusercontent.com/26665154/36401962-a75e2e54-15a0-11e8-8be3-b8271d2c6ee7.png
Also fixes a minor bug of the heartbox held sprites being in the wrong location and thus having no held sprites.
2018-02-25 01:57:03 -06:00
Reddeyfish
