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,985 Commits 66 Branches 25 Tags
RazMergeTest
Commit Graph
7618 Commits
Author SHA1 Message Date
Erik Darkpaws 7a6db2db11 Fixes indents 2019-01-21 15:42:37 -08:00
lbnesquik 3e4f380670 Implements improvements to winged flight 
Most of these came from kasparo.
 2019-01-21 19:24:52 +01:00
Erik Darkpaws 5db2816dcb Travis, stop yelling at me, it hurts my feelings 2019-01-20 22:17:23 -08:00
Erik Darkpaws 765a3be112 Mobs on the asteroid now have 15 second escape time for vore bellies, not 60 seconds. Now you can get ate by mobs without being punished with critical damage! (Does not affect Admemed™ mobs) 2019-01-20 21:34:08 -08:00
lbnesquik ec0d3e135a The following items now have some functions triggered by alt click. 
- Flashlight
- geiger counter
- T ray
- Labcoats and such
- Microwave

Feel free to suggest more.
 2019-01-19 20:42:01 +01:00
AnonymousHybiandGitHub 7b62d3fc5d Merge pull request #287 from AnonymousHybi/ColorUpdate 
Fixes blue text & Minor OOC changes
 2019-01-18 16:45:40 +00:00
VollyballyandGitHub af708a78d4 Merge pull request #284 from IgnusVam/master 
Big updoot
 2019-01-18 10:14:57 -05:00
AnonymousHybi bff9f560f7 Replaced all blue font with a custom colour 2019-01-18 15:14:32 +00:00
IgnusVam 5c68e9685c Big changes DO NOT PUSH TO LIVE YET 
- De-christmases the map
- Fixes the silly plush
- Adds a medical outpost, areas need textures
- Adds a medical shuttle, needs serious work, currently nonfunctional.
- Adds new stuff to the trade shuttle
- Tweaks the armory items
- Various other QOL improvements.
 2019-01-17 16:50:28 -07:00
lbnesquik c440277063 Add sap to trees. 
Trees can now be used to produce sap. At least, the sif ones. The glowy ones.
There is 3 different tree types and 3 associated saps types.
They can be used for some minor chemistry but nothing too cool for now.
The tree taps can be crafted with a bit of metal.
 2019-01-16 18:31:05 +01:00
TheFurryFelineandGitHub 21f3a0a188 Add Fennec Crate 
Part 2 of Fennec Palooza.~
 2019-01-14 20:04:41 -05:00
Jon ab60a12b38 Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into DarkTheme 2018-12-22 14:46:19 +00:00
Jon 27c9225728 Also enables NIFs 2018-12-22 14:26:02 +00:00
VollyballyandGitHub 2bac2a5707 Merge pull request #233 from IgnusVam/master 
Bunch'a stuff
 2018-12-13 15:30:08 -05:00
IgnusVam f467c1ab67 Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation 2018-12-11 17:46:27 -07:00
IgnusVam 118bb41409 Bunch'a stuff 
- Adds rainbow carpet, not yet buildable (working on that)
- Fixes deathclaws
- Fixes other crap
 2018-12-11 17:45:05 -07:00
Jon f89af853fe Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into NIF-Test 2018-12-10 00:40:42 +00:00
Jon 13fa795f16 Temporary removal of NIFs :c 2018-12-10 00:07:39 +00:00
Shadowfire117 20dc646893 adding in a new deer mob that can be ordered in cargo for festives decorations and meals. 2018-12-04 18:43:00 +01:00
IgnusVam 585916954e Reduces spider growth rate 
Replaces a dinger that the map generator absolutely hated for no good reason
 2018-12-02 20:42:58 -07:00
IgnusVam 4e3ea2889b Various fixes and improvements 
- Fixes a few things that slipped through the cracks in the first testing, oops
- Added new sprites to deathclaws, if you see a failsnake, yell at me
- New plush
 2018-12-02 18:11:11 -07:00
IgnusVam a0bac3e0f7 Small tweaks 
- Redid all the dingers, hopefully Travis won't whine anymore.
- Removed some buggy objects
 2018-11-30 00:20:30 -07:00
IgnusVam b0734d5aa1 Big update 
- Fixes spiders (I hope?) - Spiders now spawn in groups of 2-8, growing up should be fixed as well.
- Christmas-ifies all the maps
- Minor tweaks all around the stations
- Cleans up the map for central (a lot)
- Adds a new mob to the spawn list in the mines
- Fixes some minor shadekin issues
- Fixes it so borgs/AI can't understand gutter
- Modifies the timing of the radiation storm
- Hopefully fixes the cargo request event. No more buggy gas mixtures.
- Adds a flamboyant crate
- A bunch of other stuff.
 2018-11-29 12:35:52 -07:00
IgnusVam 5298501e0b Finally fixes fireaxes after almost a year of waiting. 2018-10-23 19:26:14 -06:00
Jon bb91b92119 Adds a delay to wheelchairs 2018-10-22 19:25:12 +01:00
Jon 46b8f0eab0 Lagholes now wormholes 2018-10-22 18:54:26 +01:00
Reddeyfish 635013f331 Merge branch 'virgoMaster' into virgoPull 2018-06-10 12:33:29 -07:00
AnewbeandVirgoBot 1800e1696f Merge pull request #5325 from elgeonmb/patch-7 
Changes experimental welder fluff
 2018-06-04 16:13:35 -04:00
Aronai SieyesandGitHub b0f21a938b Merge pull request #3822 from VOREStation/upstream-merge-5305 
[MIRROR] Prevent autosay() from creating/deleting AIs
 2018-06-02 19:03:02 -04:00
AnewbeandVirgoBot b5eea2cffa Merge pull request #5320 from VOREStation/pol-hoods 
Radiation closet hood fix
 2018-06-02 16:23:08 -04:00
AnewbeandVirgoBot 7528ac54fb Merge pull request #5305 from VOREStation/pol-autosay 
Prevent autosay() from creating/deleting AIs
 2018-06-02 12:47:27 -04:00
Arokha Sieyes 27de80991a Fix the New() on this interfering with my work! 2018-06-02 11:27:46 -04:00
NovacatandAronai Sieyes 5addac95ed Pathfinder Update (#3777) 
* Pathfinder Update

- Implimented Pathfinder, Command Exploration role
- Added Deluxe Machete for Pathfinders (just a cosmetic reskin)
- Added Pathfinder's office, between expedition prep and breifing
- Expanded size of expedition shuttle
- Ported Pilot and Explorer voidsuit from Baystation
- Restored the old air tank on the expedition shuttle
- Added a couple starter shelter capsules to exploration
- The expedition shuttle now has toggled blast doors to cover the windows
- Increases pay of pilots, SARs, and Explorers
- Adds box of volunteer headsets to the Pathfinder's locker

* Polaris Merge Compatability

* Forgot some things

* Moves PF from command to science

* Requested changes Part 1

* Travis and Access Fix

* Requested changes Part 2

* Resetting Maps Part 1

* Resetting Maps Part 2

* Replaces PF office airlock

* Requested Changes Part 3

* Remove gateway access

* Changes Locker/Door Access Req

* Removes blast doors

* Pilot voidsuit crate cost tweak
 2018-05-31 16:57:40 -04:00
Arokha Sieyes c0c091ed4a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-29-2018 
# Conflicts:
#	code/modules/power/lighting.dm
#	icons/turf/walls.dmi
 2018-05-29 21:05:27 -04:00
AnewbeandGitHub d308cb4563 Merge pull request #5269 from deathride58/fancylighting 
Makes lighting a little fancier, reduces the amount of light sources with a power greater than 1
 2018-05-29 13:33:27 -05:00
SharkmareandGitHub 6ec3003bbf Toolbelt can now hold the circuit debugger 
Finally.
 2018-05-28 23:40:51 +02:00
AtermoneraandLeshana 5c4bde965a Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms 
Reverse use of global lists where they hurt performance.
 2018-05-28 15:55:55 -04:00
VerkisterandGitHub 1222e5d0d6 Merge branch 'master' into hangryrat 2018-05-28 15:08:53 +03:00
Arokha Sieyes b96aec1e52 SYNC: Missed another closet (typo) 2018-05-27 19:53:45 -04:00
Arokha Sieyes 1437123502 SYNC: Missed one 2018-05-27 19:43:39 -04:00
Arokha Sieyes 8f8c41a7c1 SYNC: Correct vorestation closets/crates to use new system 2018-05-27 19:33:34 -04:00
Arokha Sieyes 2d89d63c09 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme
 2018-05-27 19:26:12 -04:00
Leshana 0994c9dbe7 Removes the global lists all_clothing, all_items, all_objs, and all_atoms for performance reasons. 
- The cost of maintaining these lists is more than the benefit of having them (mostly used only for debugging code)
 2018-05-27 15:20:40 -04:00
drexampleandAnewbe be5c144a16 Ports Baystation12 newest item pickup animations. Fancy! (#5302) 
* fixed photos

* Added item pick up animation

* Revert useless commit

* Removed unnecessary extra define, made sure ghost object deletes itself after animation, changed planes.
 2018-05-27 11:54:36 -05:00
AtermoneraandGitHub e1fe4d5a5d Merge pull request #5293 from VOREStation/pol-closets 
Makes closets/crates like boxes
 2018-05-26 15:24:45 -07:00
AtermoneraandGitHub f1b00c9e26 Merge pull request #5292 from Anewbe/crate_layer 
Crates should always appear below their contents
 2018-05-25 16:25:31 -07:00
Arokha Sieyes 6b42df0685 Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018 
# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.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/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-05-25 13:23:47 -04:00
Anewbe 9bc6663930 Crates should always appear below their contents 2018-05-24 17:24:14 -05:00
Arokha Sieyes f9b409549e Makes closets/crates like boxes 
Gives them a 'starts_with' (well, renames the existing one. Someone ported it but never actually applied it anywhere).
 2018-05-24 17:26:17 -04:00
AtermoneraandGitHub 73450f337d Merge pull request #5284 from Anewbe/item_zoom 
Swapping hands cancels zoom
 2018-05-24 13:19:36 -07:00