cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 23:46:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,492 Commits 66 Branches 25 Tags
ReddeyfishVor-patch-8
Commit Graph
7438 Commits
Author SHA1 Message Date
Leshana c481f01343 Fix building frames on walls and windows. 
try_build() has long accepted `user` parameter, but nothing that called try_build actually passed it!
Upgraded try_build on APC to use the user parameter, and switched to use to_chat while I was there.
 2018-04-11 19:45:04 -04:00
Verkister 2dec2545e5 Adds giant rat voremob. 
-Currently only available via pred crate/shenanigans.
-This dude is friends with regular mice but will gladly kick any other ass.
 2018-04-11 20:44:53 +03:00
Verkister 9f21628619 Adds deer taur. 
-Adds dual color deer taur.
-Sort of fits the lizardtaur saddlebag gear as well so I lazily made it accept the deer too for now.
 2018-04-11 17:14:21 +03:00
AnewbeandGitHub 8c23ec4844 Merge pull request #5153 from Neerti/4/5/2018_tile_attacking 
Adds Tile-based Attacks
 2018-04-09 19:16:58 -05:00
Leshana 4e1fa47a0b Reverts gauze disinfecting until a proper solution can be put in place. 2018-04-08 20:24:48 -04:00
ReddeyfishVorandGitHub c705d1b1a9 fix incorrect 'disable growth' logic in spiders 
previous code made the assumption that negative numbers evaluated to false.
 2018-04-06 22:52:00 -07:00
Leshana e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04 
# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
 2018-04-06 15:40:06 -04:00
Reddeyfish b52bb9a7f0 Add custom items for Igni/Kelly Summers 2018-04-05 19:11:40 -07:00
Neerti 4ac6d34235 Adds Tile-based Attacks 
Adds ability to attack mobs by clicking their tile.
When someone clicks a tile with a weapon while off help intent, and if a mob is occupying that tile, the mob will be attacked as if they were clicked directly.
If more than one mob is on a tile, one is chosen randomly.
You cannot hit yourself by clicking your own tile.
Weapons with cleaving abilities will attempt a cleave on the tile clicked on, making it very easy to hit (simple) mobs with those weapons if near you.

Other changes.
Cleave proc can accept any atom now and not just a mob.
Also cleans up weapons deciding how they can cleave somewhat.
 2018-04-05 13:28:05 -04:00
MechoidandAtermonera 57ab0e715b Constructs 2.0 - Living Stone (#5040) 
* Construct Overhaul + Related Fixes/Tweaks
 2018-04-04 23:45:00 -07:00
AtermoneraandGitHub a6ebe9b44a Merge pull request #5145 from VOREStation/vs-port-3058 
[PORT] Halve character-join lag
 2018-04-04 17:38:31 -07:00
AtermoneraandGitHub b63acc083d Merge pull request #5143 from VOREStation/fix-usr 
Reverted use of 'usr' back to 'user' from commit 05fd53e
 2018-04-04 17:35:33 -07:00
AnonymousHybiandGitHub 13aa6ad11b Merge pull request #101 from AnonymousHybi/master 
Added pianos and violins in the misc section of cargo
 2018-04-05 00:40:20 +01:00
AnonymousHybi 653a26d738 Added pianos and violins in the misc section of cargo 2018-04-05 00:38:54 +01:00
AtermoneraandGitHub a059ed0de3 Merge pull request #5133 from Cameron653/patch-1 
Syndicate Dufflebag Tweak
 2018-04-02 23:51:21 -07:00
Arokha SieyesandLeshana a6cfbc4f42 Initial cleanup/changes 2018-04-02 16:36:04 -04:00
Leshana 1f4bdc4389 Reverted use of 'usr' back to 'user' from commit 05fd53ebcc 2018-04-01 22:03:10 -04:00
MechoidandGitHub 185201c112 Merge pull request #5125 from Anewbe/bandaids 
Normal brute kits disinfect wounds
 2018-04-01 15:06:19 -07:00
MechoidandGitHub 739bbd6e2b Merge pull request #5073 from mistyLuminescence/wallets 
Wallet Expansion!
 2018-04-01 15:01:05 -07:00
ReddeyfishVorandGitHub 4909f3f22b Add trash-edible glass container (#83) 
* Add trash-edible glass container

* Refactor to clearer item path, add flavortext

* Add autolathe cost
 2018-03-31 11:11:09 -07:00
Cameron653andGitHub 4a1ef0dbd6 Makes syndie dufflebags hint that they let you move faster 2018-03-31 11:02:01 -04:00
Leshana 6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30 
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-03-31 09:20:59 -04:00
mistyLuminescence dfc0dd48bc Removes vials 2018-03-30 02:12:58 +01:00
Anewbe 88463b5709 Normal brute kits disinfect wounds 2018-03-29 17:51:55 -05:00
AnewbeandGitHub 92df13c8c1 Merge pull request #5098 from Woodratt/03232018_randomaddsntweaks 
Changes to objects random
 2018-03-29 12:37:14 -05:00
Aronai SieyesandAtermonera 7d3aec96fd Arranges lots of things into planes (#5072) 
* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
 2018-03-28 12:59:12 -07:00
AtermoneraandGitHub 6adbe5537e Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear 
Adds permanent markers
 2018-03-28 11:49:10 -07:00
Arokha Sieyes ef904f453c POLARIS: Sometimes items have this set to null because they are bad. 2018-03-25 17:09:47 -04:00
Arokha Sieyes 29eb468ef5 POLARIS: Fixes #5282 (VS) - Allow use of pens to label pill bottles, like glass bottles 2018-03-25 17:05:20 -04:00
Woodratt fe28a50574 Changes to objects random 
- Fixed the icon_state for 'structure/plushie/carp' and the random first aid kit spawner
- Added a random chance tool spawn for power tools (most of the time it should still just be regular tools)
- Adjusted the spawn rate of medkits, combat medkits should be more rare
- Cash split into its own loot item
- Plushies split into large and small plushies
- All the extra plushie spawns added to the random plushie spawn
- Eightball and conch shell added to toy spawns
- Added spawn points for the large plushies, cash, and the power tools
 2018-03-23 23:03:15 -07:00
NeertiandGitHub c75158b14d Merge pull request #5095 from Mewchild/MC-Implant 
Updates tracking implant description
 2018-03-23 18:45:09 -04:00
NeertiandGitHub 318762f091 Merge pull request #5088 from VOREStation/port-vs-catchup 
VOREStation Ports Catchup
 2018-03-22 22:32:09 -04:00
Mewchild 4cbefc8cdf Updates tracking implant description 2018-03-22 12:28:14 -05:00
Cameron653andAtermonera 59844c5553 Xenoarch Multitool & Xenoarch Excavation Drill (#5058) 
* Xenoarch Multitool & Xenoarch Excavation Drill

* Makes the tool work better

* Cuts down on lines & left comments

* change to m
 2018-03-22 09:50:50 -07:00
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