cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 13:36:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,985 Commits 66 Branches 25 Tags
RazMergeTest
Commit Graph
7618 Commits
Author SHA1 Message Date
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
Anewbe d172881b76 Splits up random.dm 2018-03-06 19:51:20 -06:00
LeshanaandGitHub 3a94638dbf Merge pull request #3156 from Verkister/wideborgs 
Small wide/dog borg tweaks/fixes
 2018-03-06 09:43:32 -05:00
AtermoneraandAnewbe 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
AnewbeandGitHub 4503e475b1 Merge pull request #5014 from PolarisSS13/Ater_Weather_report 
Weather reports won't crash when planet controller dies
 2018-03-05 19:46:25 -06:00
MechoidandAnewbe 1c94c32830 Mob Spawners can now override certain vars. (#5005) 
* Random Mob Spawners can now overwrite certain vars on the mobs they spawn.

* Spiders return home.

* Faction Streamline
 2018-03-05 19:45:11 -06:00
Aronai SieyesandGitHub 10a9793fdb Merge pull request #3177 from aztectornado/syringe-case 
Adds quickdraw objects and syringe cases
 2018-03-05 18:36:27 -05:00
Aronai SieyesandGitHub 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
AtermoneraandGitHub 6402538f3c Weather reports won't crash when planet controller dies 2018-03-04 15:41:55 -08:00
Arokha Sieyes fa95ae3d42 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2018-03-04 13:32:53 -05:00
AtermoneraandGitHub 3a85517d30 Merge pull request #5001 from Nerezza/Snowfloorfix 
Fixes #4993
 2018-03-04 10:02:14 -08:00
Aronai SieyesandGitHub 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
AtermoneraandGitHub 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
BillyBanglesandAtermonera 6ff1f1b165 fixes #4992 (#4995) 
i'm good at this i swear
 2018-03-02 18:24:51 -08:00
BelsimaandAtermonera c2be6a7575 More standardized grammar (#4977) 2018-03-02 18:24:15 -08:00
CyantimeandGitHub 4bc4ccc91c Alien pod typo 2018-03-03 00:11:30 +00:00
BelsimaandAtermonera 84d66c51df DNA injectors cause cloneloss. (#4958) 2018-03-01 12:49:11 -08:00
AnewbeandAtermonera 524c9aa5db Removes translators from the loadout (#4942) 2018-03-01 12:00:37 -08:00
AnewbeandAtermonera c13c1c6ad0 Adjusts PoIs (#4954) 
* Adjusts PoIs
 2018-03-01 11:57:18 -08:00
AnewbeandGitHub ee9061e80f Merge pull request #4982 from Cyantime/tinypda 
Fixes two minor PDA cart issues.
 2018-03-01 11:09:26 -06:00
AnewbeandGitHub dda4b68e4d Merge pull request #4981 from VOREStation/pol-radio-drama 
Adds 'Intercom Convo' verb
 2018-03-01 10:32:30 -06:00
VerkisterandGitHub 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
AnewbeandGitHub 36540182df Merge pull request #4965 from Belsima/techy 
Adds illegal and other tech to some implants.
 2018-02-28 14:17:17 -06:00
BillyBanglesandAnewbe 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
AnewbeandGitHub 2bcad10584 Merge pull request #4974 from VOREStation/pol-plushsshhhshsh 
Ports Plenty Pretty Paradise Plushes
 2018-02-28 11:19:55 -06:00
MechoidandAnewbe 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
AtermoneraandGitHub 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 SieyesandGitHub 1691569453 Merge pull request #3144 from VOREStation/aro-randkit 
Remove combat medkit from station spawns
 2018-02-27 21:51:10 -05:00
Aronai SieyesandGitHub 2935ec1ac8 Merge pull request #3149 from VOREStation/aro-sync 
Polaris Sync
 2018-02-27 21:48:52 -05:00
Aronai SieyesandGitHub dcc02e5090 Merge pull request #3153 from VOREStation/aro-convo 
Adds 'Intercom Convo' verb
 2018-02-27 21:48:39 -05:00
Arokha SieyesandLeshana 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
AtermoneraandGitHub 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