cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-28 14:36:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,250 Commits 66 Branches 25 Tags
Upstream-Sync
Commit Graph
1720 Commits
Author SHA1 Message Date
Aronai SieyesandGitHub 2935ec1ac8 Merge pull request #3149 from VOREStation/aro-sync 
Polaris Sync
 2018-02-27 21:48:52 -05:00
Arokha SieyesandLeshana 3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
 2018-02-27 21:27:35 -05:00
Arokha Sieyes f04c58f202 VS: Rewrites basically all of how bellies work 
And cleans up a ton of stuff.
 2018-02-27 13:29:45 -05:00
AnewbeandGitHub a42d7ecdb4 Merge pull request #4944 from VOREStation/pol-matweak 
Tweak weird MA override
 2018-02-25 12:38:58 -06:00
Arokha Sieyes 542bb57d0d POLARIS: Tweak weird MA override 
Not sure when this is used, but Leshana had a good suggestion for preventing it interfering with things.
 2018-02-24 13:13:10 -05:00
Arokha Sieyes 9bc7510e26 POLARIS: Tweak weird MA override 
Not sure when this is used, but Leshana had a good suggestion for preventing it interfering with things.
 2018-02-24 11:44:57 -05:00
Anewbe a18a9098b3 Removes the VeyMed license from Cargo 2018-02-23 22:04:00 -06:00
Leshana 30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23 
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-02-23 21:55:42 -05:00
BillyBanglesandAnewbe 8f8f692ea0 Makes a dark ritual even darker (#4923) 
* makes a dark ritual even darker

* makes the dark ritual maybe not THAT dark

* tweaks rune icon
 2018-02-23 13:16:26 -06:00
Aronai SieyesandGitHub 26392c09f8 Merge pull request #3094 from VOREStation/aro-spa 
Add adminload Spa map, tweaks
 2018-02-22 12:36:36 -05:00
Anewbe 8c5dc66a13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor 2018-02-21 23:33:17 -06:00
Arokha Sieyes 86b087bee0 Add adminload Spa map, tweaks 
Add a Spa map, mostly to use for events. Tweak teleporter to work better with adminloaded templates and things like that.
 2018-02-21 21:58:00 -05:00
AnewbeandGitHub a9b5b4e28f Merge pull request #4901 from VOREStation/pol-holoplants 
Adds holoplants, and to cargo
 2018-02-21 16:15:53 -06:00
Aronai SieyesandGitHub 759d7dc432 Merge pull request #3089 from VOREStation/aro-holoplants 
Adds holoplants, and to cargo
 2018-02-21 17:10:42 -05:00
BillyBanglesandAnewbe 5486edf567 Adds various cabin-related things. (#4888) 
* adds fireplace, makes bonfire generate heat

kinda, anyways

* adds sifwood tiles, fixes old blue carpets

old blue carpets are now known as "teal carpets." they still come in the
carpet crate from cargo.

* lets you dig up tree stumps with shovels

* changelogs in the house

* adds a delay to digging up stumps

digging up stumps is easier said than done
 2018-02-21 15:45:01 -06:00
AnewbeandGitHub a6653bf00a Merge pull request #4896 from VOREStation/pol-qdels 
Fix several Destoy()s
 2018-02-21 10:01:23 -06:00
Arokha Sieyes a81e3fdb49 Adds holoplants, and to cargo 
Courtesy of CEV Eris SS13 server (plus a bunch of additional code to make them real machines)
 2018-02-20 22:17:50 -05:00
Arokha Sieyes beba012f5a Adds holoplants, and to cargo 
Courtesy of CEV Eris SS13 server (plus a bunch of additional code to make them real machines)
 2018-02-20 22:17:06 -05:00
AnewbeandAtermonera 25a1f47a30 Headset sprites, planetside headset functionality (#4869) 2018-02-20 12:36:22 -08:00
Arokha Sieyes 0c0f09fe68 POLARIS: Fix several Destroy()s 2018-02-20 10:00:23 -05:00
Arokha Sieyes a75cfe0eb1 POLARIS: Fix several Destroy()s 2018-02-20 00:20:46 -05:00
Arokha Sieyes 5967bb6dc5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-6.dmm
 2018-02-18 00:25:36 -06:00
Aronai SieyesandGitHub b1b2551b9c Merge pull request #3058 from VOREStation/aro-joinspeed 
Half character-join lag
 2018-02-17 23:41:05 -06:00
Arokha Sieyes 55ba550409 More optimizations for character joins 2018-02-17 23:24:11 -06:00
Arokha Sieyes 0dd7a2e2e3 Initial cleanup/changes 2018-02-17 19:47:39 -06:00
Anewbe cce3c607f2 HoS/Warden helmet tweaks 2018-02-17 15:57:26 -06:00
AnewbeandGitHub 329a65be08 Merge pull request #4838 from VOREStation/pol-emerboxes 
Port Bay's survival boxes
 2018-02-17 10:05:39 -06:00
Leshana 7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16 
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
 2018-02-17 00:35:29 -05:00
Arokha Sieyes f4d0ec3fb8 Port Bay's survival boxes 
Includes some tweaks to items that usually come in the boxes to make them more similar to the Bay implementation.
 2018-02-16 19:21:15 -06:00
Schnayy 02447e5c19 The largest PR I've probably actually done. Adds the following: 
* Bouquets
* Fake Bouquets. Can be won from arcade machines.
* Heart box chocolates containing a set arrangement of chocolates.
* Adds said chocolates (milk chocolate, white chocolate, and truffles) all bite-sized.
* Adds 5 cards, one blank and four with covers. Function identical to paper except you can't make an airplane because I hate fun.
* Adds The four cards with covers, 3 real bouquets, and 2 chocolate boxes to cargo under a 'gift crate' for 10 points.

Sprites by me. Code would not be possible without cerebul's help. Let me know if I've goofed on something, but I did test all of the items + ordering them from cargo.
 2018-02-15 03:33:23 -06:00
AnewbeandGitHub ae2031770e Merge pull request #4807 from Neerti/2/12/2018_lead_tweaks 
Tweaks Lead & Radiation Resistance
 2018-02-13 10:40:51 -06:00
AnewbeandAtermonera 51d425b1b8 THE MINI FIST-PUNCH UPDATE (#4804) 
* VARIOUS FISTICUFFS RELATED CODE CHANGES
 2018-02-12 23:17:35 -08:00
Neerti 7da5da69eb Tweaks Lead & Radiation Resistance 2018-02-12 07:10:26 -05:00
Aronai SieyesandGitHub 7ff0493074 Merge pull request #2998 from Jwguy/Silver-AwooCosplayCrate 
AwooCosplayCrate
 2018-02-10 23:06:35 -06:00
mistyLuminescenceandAtermonera fa6ff94474 What's Yours Is Mined (#4556) 
* Boom!

* Wires!
 2018-02-09 18:56:46 -08:00
SilverandGitHub 5bfca77f04 Proper Naming for VIRGO PR #3000 
https://github.com/VOREStation/VOREStation/pull/3000

Adds Propernaming
Adds Contraband Variable
 2018-02-08 17:43:23 -06:00
Silver 13b710fb61 Silver-ContrabandUpdate 
Adds AwooCrate and MlemCrate to Contraband Supplypack. (These show up under 'supplies' in a hacked cargo console and are quite expensive)
 2018-02-08 13:01:51 -06:00
Silver ef4d87a352 AwooCosplayCrate 
Adds Wolfgirl Cosplay Crate to Supplypacks under Recreation.

Adds Wolfgirl Replica Sword and Autumn Shield.

Adds the above and three existing items to aforementioned crate.
 2018-02-08 12:57:18 -06:00
Aronai SieyesandGitHub c0a7016d9a Merge branch 'master' into expgun2 2018-02-08 01:13:05 -05:00
Leshana 1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07 
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
 2018-02-07 19:30:50 -05:00
Cyantime d0f32b4a53 Adds frontier phaser to cargo 2018-02-06 21:58:08 -05:00
Leshana 95b9e67660 Ports callback datum from TG 
* A callback datum system was created, a common framework that handles all of the nuts and bolts so anyone can implement callbacks easily without worrying about how to invoke procs.
* Adapted from tgstation/tgstation#22476 by MrStonedOne
 2018-02-05 15:50:14 -05:00
Leshana 5847319443 Update every initialize() proc to return an initialize hint. 
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
 2018-02-05 15:50:13 -05:00
mistyLuminescenceandAnewbe da4bd82a5d Adds more med gear to R&D and Cargo (#4691) 
* Adds more med gear to R&D and Cargo

* standardises + adds sprites

* Removes cargo crate
 2018-02-04 22:18:36 -06:00
Andromeda-K22andAnewbe cee3066a41 RUST additions and updates, Modular guns, and Lead. (#4667) 
* expanding rupture procs
adds hydromagnetic traps for power production.

* Minor tweaks.

* Adds modular guns using research components.

* Updates materials to have a radiation_resistance variable, used in calculating radiation. Adds Lead as a material.

* Un-zeros stock material radiation resistance.

* Adds, and enables four 'end-events' for the RUST in place of the old Rupture() proc.

* Map muckery?

* absolute pathing i guess?

* getting angry, travis.

* TRAVIS
STAHP

* I...
Comments? Lists? Who the hell knows.
 2018-02-04 18:04:28 -06:00
KetraiandGitHub 93a9e6012d Makes the energy carbine crate consistent. 
It made no damn sense to get 3 of them for the same price as the energy gun crate, which gives 2 energy guns, despite laser carbines being considered superior in some regards.
 2018-02-04 14:20:03 +01:00
Leshana df21594485 Ports callback datum from TG 
* A callback datum system was created, a common framework that handles all of the nuts and bolts so anyone can implement callbacks easily without worrying about how to invoke procs.
* Adapted from tgstation/tgstation#22476 by MrStonedOne
 2018-02-03 20:54:40 -05:00
Leshana cef001bf2a Update every initialize() proc to return an initialize hint. 
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
 2018-02-03 01:00:57 -05:00
Arokha Sieyes 17723b7df6 Cleans up references to assistant 
Defines the USELESS_JOB value as "Visitor"
 2018-01-31 00:55:13 -05:00
Aronai SieyesandGitHub 03319e4597 Merge pull request #2811 from Verkister/otiepoop 
Otie fixes and tweaks plus another new variant.
 2018-01-30 16:21:55 -05:00