cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-06 22:29:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,102 Commits 8 Branches 26 Tags
33f4048e4175873f2c84a97ccaf6eff7beea8e36
Commit Graph

20112 Commits

Author SHA1 Message Date
Aronai Sieyes
33f4048e41 Merge pull request #3180 from Konabird/RischiEgg 
Fixes Rischi's egg implant to actually work
 2018-03-05 18:35:34 -05:00
Aronai Sieyes
efd96ea7c2 Merge pull request #3178 from VOREStation/aro-sync 
Polaris Sync
 2018-03-05 18:26:24 -05:00
Leshana
40d155a20a Keep nurse hat spiders. 2018-03-04 16:03:53 -05:00
Konabird
a5b1befc6d Fixes Rischi's egg implant to actually work 2018-03-04 14:37:20 -06:00
Arokha Sieyes
8edfdca9ac Remove design_vr for ear translator as it's a stock polaris one now 2018-03-04 13:59:08 -05:00
Arokha Sieyes
fa95ae3d42 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2018-03-04 13:32:53 -05:00
Aronai Sieyes
6ce25e9166 Merge pull request #3172 from VOREStation/aro-bellytweak 
Make sure not to add extra vore organs
 2018-03-04 13:28:30 -05:00
Atermonera
18c0bc5b27 Merge pull request #5000 from Belsima/slime-fix 
Slime brains now actually have container settings!
 2018-03-04 10:02:51 -08:00
Atermonera
947c076d04 Merge pull request #4996 from Verkister/patch-6 
Fixes drone borgs spawning with dropped IDs
 2018-03-04 10:02:34 -08:00
Aronai Sieyes
9517a30d4e Merge pull request #3167 from LiquidFirefly/patch-1 
Fixes a single letter.
 2018-03-04 12:41:53 -05:00
Arokha Sieyes
f5b400f6e0 Make sure not to add extra vore organs 2018-03-04 12:16:10 -05:00
Nerezza
715bed5d58 Fixes Switch Shoe Layer to re-layer shoes in real time (#4998) 2018-03-03 17:44:59 -08:00
Screemonster
13e83b00d1 Makes drills report faults over supply channel (#4989) 
* Makes drills report faults over supply channel

* too chatte

* caps and punctuation are important
 2018-03-03 18:47:07 -06: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
Belsima
3c6e7a95b9 orgam 2018-03-03 11:43:50 -05:00
Belsima
c2be6a7575 More standardized grammar (#4977) 2018-03-02 18:24:15 -08:00
Arokha Sieyes
f37e75011b Revert "Reverse floor decal removal commit 00f8ae5" 
This reverts commit 517d4a9e56.
 2018-03-02 20:04:08 -05:00
Verkister
d077784729 Fixes drone borgs spawning with dropped IDs 
Someone had moved the thing back to the outcommented older code part without updating the old code there.
 2018-03-02 11:20:14 +02:00
Arokha Sieyes
8a8c4d76d2 Convert bellies to save using JSON 2018-03-02 02:22:20 -05:00
Anewbe
0722293830 Manual revert of https://github.com/PolarisSS13/Polaris/pull/4839 (#4908) 2018-03-01 21:27:04 -08:00
Layla Crosse/Occula Drenn
b358e10727 Fixes a single letter. 
Pshhh, I'm not even mad, wha?  Why would I be mad?  Preposterous.
 2018-03-01 16:43:13 -05:00
Mechoid
09dd73ae64 Merge pull request #4986 from Anewbe/hail_adjustments 
Hail is less omnicidal
 2018-03-01 13:39:49 -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
4efc7e7efe Merge pull request #4979 from Belsima/cube 
Discourages eating monkey cubes
 2018-03-01 10:32:57 -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
517d4a9e56 Reverse floor decal removal commit 00f8ae5 2018-03-01 09:43:38 -05:00
Leshana
94d026e2b1 Merge pull request #3164 from Heroman3003/handytry 
Fix for disappearing dogborgs
 2018-02-28 23:14:58 -05:00
Heroman3003
20bc8130f5 brokenwideborgs fix 2018-03-01 12:47:27 +10:00
Aronai Sieyes
e982225d1a Merge pull request #3163 from VOREStation/aro-destroy-medical-forever-because-obviously-i-hate-medical-duh 
... but not borg syringes.
 2018-02-28 21:09:13 -05:00
Aronai Sieyes
48b8c6f5fb Merge pull request #3158 from VOREStation/aro-runtime 
Fix a runtime with snacks
 2018-02-28 20:55:09 -05:00
Arokha Sieyes
489634a204 ... but not borg syringes. 2018-02-28 20:53:07 -05: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
Arokha Sieyes
5d54787198 Fix a runtime with snacks 2018-02-28 15:57:07 -05:00
Anewbe
3c4996b475 Hail is less omnicidal 2018-02-28 14:45:10 -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
Aronai Sieyes
f9427ec4a5 Merge pull request #3143 from Cyantime/patch-4 
Adds onions to the seed vender
 2018-02-27 21:50:48 -05:00
Aronai Sieyes
3ef3275d59 Merge pull request #3139 from VOREStation/Cameron653-patch-2 
Promethean Water Edits
 2018-02-27 21:50:38 -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
Aronai Sieyes
0f4185ceec Merge branch 'master' into aro-bellies 2018-02-27 21:39:53 -05:00
Aronai Sieyes
d0fbc58100 Merge pull request #3145 from VOREStation/aro-nifexamine 
Readds NIF examine text
 2018-02-27 21:38:25 -05:00
Aronai Sieyes
91c08edf70 Merge pull request #3133 from VOREStation/exp-turfs-overlays 
Convert turfs to use add_overlays()
 2018-02-27 21:31:35 -05:00
Arokha Sieyes
0c4cc6811a VS: Convert some VS things to use global_announcer 2018-02-27 21:30:06 -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
Anewbe
33766df3d4 Fixes a runtime in hail code (#4973) 2018-02-27 17:46:08 -08:00
BillyBangles
f49b1a9ad2 Adds ice puzzle POIs (#4963) 
* adds slippery ice tiles

* adds ice puzzle POIs

also bedrock (impassable) rock, and ice crystals (which use placeholder
graphics for now)
 2018-02-27 17:45:47 -08:00
Arokha Sieyes
66f2acb931 Handle NIF examine saving string vs null 2018-02-27 19:22:31 -05:00