cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-24 20:46:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,773 Commits 66 Branches 25 Tags
TravisFix
Commit Graph
7604 Commits
Author SHA1 Message Date
Reddeyfish ace0058b1f Merge branch 'virgoMaster' into virgoPull 2018-03-21 21:22:51 -07:00
Arokha SieyesandLeshana cad8df658e POLARIS: Communicator small refactor 2018-03-21 14:30:43 -04:00
NeertiandGitHub 70ac478aea Merge pull request #5065 from VOREStation/vs-port-3204 
[PORT] Revamp logging for consistency
 2018-03-20 21:13:47 -04:00
Arokha Sieyes 3cc7138ca3 POLARIS: Fixes #5282 (VS) - Allow use of pens to label pill bottles, like glass bottles 2018-03-20 19:01:36 -04:00
Billy Bangles d953a58413 travis pls 
why must we argue so
 2018-03-19 21:23:48 -04:00
Billy Bangles 05fd53ebcc adds permanent markers 
also tweaks paint recipe to use ink instead of crayons.
 2018-03-19 20:20:31 -04:00
BillyBanglesandAtermonera 85e377f017 Adds a cursed sword (and other haunted things) (#4931) 
* adds cursed sword and 'haunted' object framework.

* fixes back.dmi conflicts

* adds cursed blade ghost pod

as well as fixing some ghost pod oddities

* fixes misc.dm conflicts

* adds cursed sword cave POI

* makes cursed sword use voice mob

as opposed to a brainmob
 2018-03-19 11:49:33 -07:00
mistyLuminescence 8769f4605a trims list 2018-03-18 03:20:36 +00:00
Arokha Sieyes 54d06dbef0 POLARIS: Sometimes items have this set to null because they are bad. 2018-03-17 21:44:13 -04:00
mistyLuminescence 70f7ef7d6f Wallet expansion! 2018-03-17 21:10:23 +00:00
AnewbeandGitHub d36e67d90d Merge pull request #5064 from VOREStation/vs-port-3142 
[PORT] Improved playsound and drop_location() from /tg
 2018-03-17 15:01:07 -05:00
Heroman3003andAronai Sieyes 1aef94ae0e Module change and reset animations for borgs (#3210) 
* Added robot module reset and change animation

* changed some procs to more appropriate ones

* removed unnecesary sleep()

* readded intialize proc for_temp_visual
 2018-03-16 20:35:08 -04:00
Aronai SieyesandGitHub 961f2934c4 Merge pull request #3242 from VOREStation/aro-commfactor 
Communicator + NIF Refactor
 2018-03-16 20:34:21 -04:00
AtermoneraandGitHub 4fa4173e29 Merge pull request #5049 from Anewbe/quickdraw_items 
Ports quickdraw storage items from VIRGO
 2018-03-16 11:37:58 -07:00
Arokha Sieyes 020c2a06f1 POLARIS: Communicator small refactor 2018-03-15 23:47:00 -04:00
Leshana a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15 
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2018-03-15 22:41:14 -04:00
Anewbe 5212fa152b Species names should now use defines 2018-03-15 20:24:45 -05:00
Arokha SieyesandLeshana 6158cd1d26 POLARIS: Use drop_location() for things 2018-03-13 19:23:46 -04:00
Arokha SieyesandLeshana 73838e0a62 POLARIS: Revamp logging to be consistent 2018-03-13 18:20:58 -04:00
LeshanaandAnewbe 57ed0f6e9e Sundry Runtime Fixes - March (#5047) 
* Fixes Runtime in tools.dm,239: undefined variable /mob/living/simple_animal/retaliate/solargrub/var/handcuffed

* Add logging to help identify the cause of runtime in examining zshadow mobs.

* Fix Runtime in buckling.dm,165: Cannot execute null.forceMove().

* Fixes  Runtime in robot_items.dm,31: Cannot read null.origin_tech

* Fixes Runtime in paper_bundle.dm,183: Cannot read null.loc
 2018-03-13 00:13:19 -05:00
Reddeyfish 03f3d9b5c1 Merge branch 'virgoMaster' into virgoPull 2018-03-12 18:41:26 -07:00
AtermoneraandGitHub cb37f7d36c Ater missed another <br> 2018-03-11 19:26:08 -07:00
AnewbeandGitHub 9f56416684 Merge pull request #5037 from VOREStation/aro-updateicons 
Rewrite human/update_icons()
 2018-03-11 21:03:10 -05:00
Anewbe a8cc2df4ad Ports quickdraw storage items from VIRGO 2018-03-11 16:56:17 -05:00
CerebulonandAnewbe b7090d7df2 Adds Tajaran Akhani language. (#5032) 
* Adds Tajaran Akhani language.
Fixes plural form of Tajaran (Tajara->Tajaran) in about 50 places.

* Gives the language a colour distinct from Siik.

* Changelog
 2018-03-11 16:55:08 -05:00
MechoidandGitHub edab848f2f Merge pull request #5024 from Anewbe/random_spawners 
Splits up random.dm
 2018-03-10 19:07:47 -08:00
Mewchild e129f03b42 Gives RD explorer comms 2018-03-10 16:52:52 -06:00
Arokha Sieyes 46f4022852 VS: Consistent logging changes to match polaris commit 2018-03-10 17:18:09 -05:00
Arokha Sieyes 2c9bdf3ae4 POLARIS: Revamp logging to be consistent 2018-03-10 17:18:09 -05:00
AnewbeandGitHub f2da429eab Merge pull request #4980 from MisterLayne/ED_CLN 
Adds the ED-CLN
 2018-03-10 15:04:07 -06:00
LayneandAnewbe acdde85f4d Reinforced snowball fix. (#4991) 
* temp snowball fix

* Create MisterLayne - SnowballTEMPFIX

* Update and rename MisterLayne - SnowballTEMPFIX to MisterLayne - SnowballTEMPFIX.yml
 2018-03-10 14:58:25 -06:00
Aronai SieyesandGitHub 54cf9636ec Merge pull request #3189 from Verkister/moreborgostuff 
Readies our borg stuff for next sync fixes.
 2018-03-10 15:01:04 -05:00
Arokha Sieyes 2970b37fa1 U_I Phase 2.6: Blood, Helmets, Unneeded calls 2018-03-08 19:34:01 -05:00
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
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