cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-17 00:56:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,176 Commits 66 Branches 25 Tags
86e413bf00a71afc9831e355d2b6ff72c3d2eed3
Commit Graph
14895 Commits
Author SHA1 Message Date
Aronai SieyesandGitHub 86e413bf00 Merge pull request #3634 from VOREStation/aro-taur_suits_must_die 
Removes taur suits
 2018-05-08 19:09:29 -04:00
SpadesandGitHub ba5bfa00bb Merge pull request #3583 from Verkister/chompychomp 
Adds a funky fresh feature to beartraps.
 2018-05-05 08:32:38 -04:00
SpadesandGitHub 9007b9e398 Merge pull request #3621 from VOREStation/aro-cryoitems 
Redo cryo item storage
 2018-05-05 08:28:55 -04:00
Arokha Sieyes c4cbe31199 Removes taur suits 2018-05-04 22:16:17 -04:00
Aronai SieyesandGitHub 956fb7940a Merge pull request #3617 from VOREStation/aro-dronesleep 
Allow maint drones to 'cryo' using the robot pod things
 2018-05-04 18:57:28 -04:00
Arokha Sieyes bdc7e504fb Redo cryo item storage 
Fixes #2682, Fixes #2610

Cryo no longer stores any items, only logs for admin use and for player use who cryo'd with what 'important' items.
 2018-04-30 20:30:58 -04:00
Aronai SieyesandGitHub 8dc694cfb6 Merge pull request #3612 from VOREStation/aro-issue-3582 
Ensure the right species are in suit cyclers
 2018-04-30 19:30:54 -04:00
Arokha Sieyes 40849de55f Allow maint drones to 'cryo' using the robot pod things 
Dunno why they were excluded. If it's a horrible issue I guess we'll find out why.
 2018-04-30 17:49:47 -04:00
Aronai SieyesandGitHub 1183e943b1 Merge pull request #3579 from Very-Soft/underdark-bones 
Adds warning signs to the entrance of the underdark
 2018-04-30 15:07:04 -04:00
Arokha Sieyes 1f55a4539a Ensure the right species are in suit cyclers 
Fixes #3582
 2018-04-30 14:57:05 -04:00
Very-Soft 5715e58691 Adds signs and bones to the underdark! 2018-04-28 23:31:05 -04:00
Spades b06b1d16a8 Makes file pathing for mobs not complete autism 2018-04-28 13:37:41 -04:00
Verkister f01a8fffe3 hurrgh 2018-04-28 00:28:15 +03:00
Arokha Sieyes ff452d5be9 Undoes species economic modifiers from Polaris, leaves them all at the human amount 2018-04-25 17:53:10 -04:00
Arokha Sieyes 6c686e6a2f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018 
# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme
 2018-04-25 17:23:33 -04:00
AtermoneraandGitHub 7d6fba3ba1 Merge pull request #5194 from Anewbe/species_economic 
Species economic modifier is now a species var
 2018-04-24 23:26:41 -07:00
Leshana c09412c33e Implements the Mining Equipment Vendor 
Adds the Mining Equipment Vendor machine, which sells lots of items for points earned by mining.
Enhanced the ore processor to give points for processed ore.
Added some miscellaneous items such as hyposprays for miners.
Switched mining machines to use the nice new icons.
 2018-04-24 18:18:54 -04:00
Leshana 218c17d268 Ported laser pointer. It lets you point at stuff with lasers. 2018-04-24 12:59:27 -04:00
Leshana 43b8c1720c Adds the Kinetic Accelerator 
A mining gun, this upgradable energy weapon can mine mineral turfs at a distance.  It does only 25% of nominal damage when fired indoors.
It can be upgraded with modkits, giving it range, pretty colors, aoe against minerals or mobs.
 2018-04-24 12:59:23 -04:00
Leshana 051384ee22 Adds the Resonator 
A device which sets up resonating energy fields which collapse, mining mineral turfs and/or doing damage to any mobs standing inside.  Does no damage to anything else, and damage to mobs is only high when used in low temperature environment (such as... outside or in space)
Uses quite a few dmis, for the icons, in hand icon, and effect icons.  Includes sound effects
Ported from tg and Paradise
 2018-04-24 12:57:50 -04:00
Arokha Sieyes d5c9d3cb4e Port /tg/ lavaland shelters 
Nanotech twist rather than bluespace, but whatever.
 2018-04-23 15:25:35 -04:00
AnewbeandGitHub 152093cda0 Merge pull request #5197 from VOREStation/port-3500-brig-timers 
Rewrite brig timers to initialize properly
 2018-04-22 11:52:21 -05:00
AnewbeandGitHub 4a039d94a5 Merge pull request #5196 from Schnayy/plushiefix 
Carp Plushie Fix
 2018-04-22 11:49:52 -05:00
Arokha SieyesandLeshana 856a6db696 Rewrite brig timers to initialize properly 2018-04-20 12:04:02 -04:00
Schnayy b56299cc57 - Fixes carp plushies to now have a base sprite & be selectable in the loadout. 
- Adjusts gift vendor to have a few of the newer plushies, as well as change them to cost thaler rather than a coin.
- Champagne is now a premium item rather than contraband.
 2018-04-20 09:55:09 -05:00
Leshana 438203393e POLARIS: Fix cutting of bedsheets while holding them. 
Cutting bedsheets while holding them dropped the resulting rags in the mob's contents.
 2018-04-19 20:51:25 -04:00
Aronai SieyesandGitHub fa8f21673c Merge pull request #3506 from VOREStation/aro-portallocal 
Fix cascade portal teleporting
 2018-04-19 20:30:34 -04:00
Aronai SieyesandGitHub 6f57022a0c Merge pull request #3448 from VOREStation/aro-taurriding 
Lazily implements taur riding
 2018-04-19 20:21:46 -04:00
Arokha Sieyes 86a0536705 Fix cascade portal teleporting 2018-04-19 20:17:29 -04:00
Anewbe 323d3aa42c Species economic modifier is now a species var 2018-04-19 18:06:02 -05:00
Arokha Sieyes 7e993c95d3 Rewrite brig timers to initialize properly 2018-04-19 18:28:57 -04:00
Mechoid d362541220 Fixes mob wall-bashing. 2018-04-18 21:53:58 -07:00
AtermoneraandGitHub 35b60f19f8 Merge pull request #5175 from Anewbe/selective_aooc 
Removes AOOC from non-team antags
 2018-04-18 14:21:01 -07:00
Aronai SieyesandGitHub 35ec513b28 Merge pull request #3452 from VOREStation/aro-sync-04122018 
Polaris Sync 04-12-2018
 2018-04-18 14:04:27 -04:00
Aronai SieyesandGitHub 80c8bb5e34 Merge branch 'master' into aro-taurriding 2018-04-18 14:01:50 -04:00
MarinaGryphonandAnewbe 9e57b11a87 Fixes various implant/admin verb typos (#5177) 
* Removes 'independant'

* Update Space Station 13 areas.dm

* Fixes the AI law typo

* Fixes another typo.

Somewhat out of scope(?), but it's just a typo.
 2018-04-17 23:05:12 -05:00
AnewbeandGitHub c29d830e28 Merge pull request #5166 from Heroman3003/closet-coloring-fix 
Fixed closet painter making non-closet 'closets' invisible
 2018-04-17 23:04:43 -05:00
Leshana 989d8a727d POLARIS: Fix cutting of bedsheets while holding them. 
Cutting bedsheets while holding them dropped the resulting rags in the mob's contents.
 2018-04-17 20:24:06 -04:00
Leshana b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
 2018-04-15 14:19:36 -04:00
Anewbe 8cafd92f27 Removes AOOC from non-team antags 2018-04-14 23:25:34 -05:00
AnewbeandGitHub fd29a3b841 Merge pull request #5165 from VOREStation/port-fix-wall-frames 
Fix Wall Frames - Several Ways
 2018-04-13 14:03:34 -05:00
AnewbeandGitHub 8adf777a72 Merge pull request #5167 from Heroman3003/sheet-snatch-fix 
Fixed sheet snatcher spawning stacks with wrong looking icon
 2018-04-13 14:01:17 -05:00
AnewbeandGitHub 337e5e7436 Merge pull request #5164 from Heroman3003/legcuffies 
Fixed legcuffs not being placeable on handcuffed people
 2018-04-12 17:43:37 -05:00
Aronai SieyesandGitHub 83c27b175f Merge pull request #3446 from Heroman3003/fuzzy-legcuffs 
Added fuzzy legcuffs
 2018-04-12 18:42:54 -04:00
Arokha Sieyes 1273ca9ed4 Lazily implements taur riding 
It's pretty lazy. I'm sure someone with *effort* can touch it up.
 2018-04-12 15:10:17 -04:00
Heroman3003andHeroman3003 1ff2f26889 Fixed legcuffs checking for being handcuffed instead of legcuffed when put on 2018-04-13 05:00:18 +10:00
Heroman3003 dd2a46281e Added fuzzy legcuffs 2018-04-13 04:56:16 +10:00
Aronai SieyesandGitHub 5ff4f49cba Merge pull request #3437 from Verkister/patch-14 
Fixes teal carpets.
 2018-04-12 11:51:58 -04:00
Aronai SieyesandGitHub 298def0af5 Merge pull request #3438 from Verkister/dur 
Adds deer taur.
 2018-04-12 11:51:42 -04:00
Aronai SieyesandGitHub 8afd5cad9a Merge pull request #3441 from Verkister/rous 
Adds giant rat voremob.
 2018-04-12 11:51:29 -04:00