cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-09 07:40:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,088 Commits 8 Branches 26 Tags
8edfdca9acfba25b5ec71cae407ddcb5358c35af
Commit Graph

7297 Commits

Author SHA1 Message Date
Arokha Sieyes
fa95ae3d42 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2018-03-04 13:32:53 -05:00
Atermonera
3a85517d30 Merge pull request #5001 from Nerezza/Snowfloorfix 
Fixes #4993
 2018-03-04 10:02:14 -08:00
Atermonera
7a49fae955 Merge pull request #4997 from Cyantime/patch-1 
Fixes typo in alien pod loot pile
 2018-03-03 17:44:18 -08: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
Nerezza
b9b79af6c2 Fixes #4993 
Snow overlays no longer block interractions with the floor beneath them.
 2018-03-03 11:26:15 -06: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
Cyantime
4bc4ccc91c Alien pod typo 2018-03-03 00:11:30 +00: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
c13c1c6ad0 Adjusts PoIs (#4954) 
* Adjusts PoIs
 2018-03-01 11:57:18 -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
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
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
1691569453 Merge pull request #3144 from VOREStation/aro-randkit 
Remove combat medkit from station spawns
 2018-02-27 21:51:10 -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
Arokha Sieyes
5bf8dd9caa Remove combat medkit from station spawns 
It's pretty damn powerful for something you can just randomly find in several spots on the station.
 2018-02-26 15:26:27 -05:00
Anewbe
d1aa9affe4 Merge pull request #4953 from Schnayy/trinketbox 
Trinket box
 2018-02-26 10:04:14 -06:00
Belsima
59e07f941e Implant Tech 2018-02-26 09:23:18 -05:00
Nerezza
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
Anewbe
5cd5eaaad8 Merge pull request #4949 from Nerezza/Floor-fixes 
Flooring fixes
 2018-02-25 12:39:33 -06:00
Anewbe
a42d7ecdb4 Merge pull request #4944 from VOREStation/pol-matweak 
Tweak weird MA override
 2018-02-25 12:38:58 -06:00
Schnayy
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
Atermonera
8315c0b92f Merge pull request #4938 from Anewbe/bombs_again 
Further Package Bomb adjustments
 2018-02-24 22:55:40 -08:00
Nerezza
c7fdd099b6 Flooring fixes 
Firstly it fixes a long-standing bugs with constructable flooring not actually populating on server startup, but instead through a proc that's only called on existing floor tiles.

Second it changes sif wood tiles into a child of wood tiles now that the reason for carpet colors not working is known & fixed.
 2018-02-24 15:31:10 -06:00
Aronai Sieyes
f29484f8da Merge pull request #3117 from VOREStation/aro-fbpcells 
Adds a synth backup cell to synth survival box, plus goggles
 2018-02-24 14:43:48 -05:00
Aronai Sieyes
f6d65ec0b8 Merge pull request #3114 from VOREStation/aro-matweak 
Tweak MA constructor
 2018-02-24 14:43:26 -05:00
Arokha Sieyes
19cffffdc3 VS: Synth goggles in survival box 2018-02-24 14:14:35 -05:00
Leshana
4ebbf1ce7a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24 
# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm
 2018-02-24 13:19:10 -05:00
Arokha Sieyes
542bb57d0d POLARIS: Tweak weird MA override 
Not sure when this is used, but Leshana had a good suggestion for preventing it interfering with things.
 2018-02-24 13:13:10 -05:00