Commit Graph

1594 Commits

Author SHA1 Message Date
Sharkmare 6c53757e95 Duckness 2019-03-20 16:45:00 +01:00
Sharkmare e26d539f5a Preparing the coming of the dark one.
Egg.

By now it should be clear Egg = Secret, dont look if you dont wanna be spoiled, dont spoil others.
2019-03-20 16:21:13 +01:00
noah the goodra 1812fe88ee more music lines 2019-02-16 00:30:04 -06:00
Shadowfire117 f652d5c732 Merge branch 'master' of https://github.com/Shadowfire117/CHOMPstation 2019-01-30 20:20:28 +01:00
Shadowfire117 d58ab8d98c Chocobos 2019-01-30 20:17:04 +01: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
TheFurryFeline 21f3a0a188 Add Fennec Crate
Part 2 of Fennec Palooza.~
2019-01-14 20:04:41 -05:00
Jon 27c9225728 Also enables NIFs 2018-12-22 14:26:02 +00: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 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
Reddeyfish 635013f331 Merge branch 'virgoMaster' into virgoPull 2018-06-10 12:33:29 -07:00
Anewbe b5eea2cffa Merge pull request #5320 from VOREStation/pol-hoods
Radiation closet hood fix
2018-06-02 16:23:08 -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
Anewbe 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
Verkister 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
Atermonera e1fe4d5a5d Merge pull request #5293 from VOREStation/pol-closets
Makes closets/crates like boxes
2018-05-26 15:24:45 -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
Anewbe 7e44e95d24 Corrects some plane and layer issues 2018-05-20 18:41:21 -05:00
Reddeyfish 813d7bf643 Merge branch 'virgoMaster' into virgoPull 2018-05-19 17:16:17 -07:00
Arokha Sieyes 7ec5adf010 Remove some missed spare helmets
Fixes #3724
2018-05-18 14:42:29 -04:00
deathride58 718ca41ea0 tweaks a bunch of lighting values. reduces the amount of light_power values greater than 1 2018-05-16 01:42:01 -04:00
Arokha Sieyes bdfa34c911 SSAO object excludes
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:54:10 -04:00
Arokha Sieyes 91f0c05a4b SSAO object excludes
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:38:22 -04:00
Aronai Sieyes ba6a2b5641 Merge pull request #3668 from VOREStation/polaris-sync-2018-05-01
Polaris Sync 2018-05-01
2018-05-13 23:20:18 -04:00
Arokha Sieyes 4706bf1801 Resolve shower curtain/steam layering issue
Reported in https://github.com/VOREStation/VOREStation/issues/3594, curtains and steam layer under mobs due to the plane update. This fixes that, and causes them to layer correctly.
2018-05-12 15:29:17 -04:00
Arokha Sieyes c4f9017c76 Rename snake to giant snake
To prevent mistakes like this in the future!
2018-05-10 14:26:18 -04:00
Leshana 33202c5c38 Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml
2018-05-10 13:48:20 -04:00
Mechoid 4d028ee0f3 Removes my incompetence.
Re-adds my incompetence.
2018-05-08 18:41:47 -07:00
Mechoid 3a2f21ca31 Weak mobs (Below 10 damage output) cannot smash destroyable structures like Closets. 2018-05-08 16:19:44 -07:00
Arokha Sieyes c4cbe31199 Removes taur suits 2018-05-04 22:16:17 -04:00
Verkister 615928c31f Merge branch 'master' into hangryrat 2018-05-02 10:48:57 +03:00
Atermonera 847590758b Merge pull request #5233 from VOREStation/pol-vs-3594
Resolve shower curtain/steam layering issue
2018-05-01 13:02:16 -07:00
Atermonera 44cc2e26c7 Merge pull request #5229 from Neerti/4/29/2018_remove_world_REMOVE_WORLD
for(var/bad_code in world)
2018-05-01 13:00:18 -07:00
Aronai Sieyes 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
Verkister f8d6449bc1 pathing update 2018-04-30 20:30:16 +03:00
Arokha Sieyes 28c300359b Resolve shower curtain/steam layering issue
Reported in https://github.com/VOREStation/VOREStation/issues/3594, curtains and steam layer under mobs due to the plane update. This fixes that, and causes them to layer correctly.
2018-04-30 12:50:47 -04:00
Neerti be73b8c36a for(var/bad_code in world)
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
2018-04-29 17:55:04 -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
Reddeyfish 1c1ab01a69 Merge branch 'virgoMaster' into virgoPull 2018-04-28 10:12:34 -07:00