cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,820 Commits 6 Branches 0 Tags
84f57b8bccf228b749a374c8ca69d9572b30124f
Commit Graph

174 Commits

Author SHA1 Message Date
Casey
5510dbf441 Merge pull request #12392 from Heroman3003/cookiefix 
Brings REAL cookies to everywhere they belong
 2022-03-07 09:06:24 +00:00
Casey
80f5298a18 Ammo Boxes 2022-03-03 21:23:43 +00:00
Nadyr
0410e03bc6 Merge pull request #3464 from CHOMPStation2/upstream-merge-11870 
[MIRROR] Fixes startup issues with corpse equipment
 2021-12-12 06:02:16 -05:00
Casey
9163ddb85b Renames Engineer, new alt-titles for Stellar Delight 2021-12-12 08:46:53 +00:00
Casey
fa4010e930 Merge pull request #11870 from Heroman3003/corpsefix 
Fixes startup issues with corpse equipment
 2021-12-10 06:09:10 +00:00
Chompstation Bot
4f0b74e375 [MIRROR] :siffet: 2021-10-24 23:49:32 +00:00
Aronai Sieyes
116edd7995 Merge pull request #11543 from VOREStation/upstream-merge-8246 
[MIRROR] Random Spawner Stuff
 2021-10-22 18:23:30 +00:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Nadyr
744c106c86 Merge branch 'master' into upstream-merge-11179 2021-07-20 20:59:10 -04:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Novacat
6b785cb0de Merge pull request #11174 from Very-Soft/smoletweak 
Smole gateway tweak
 2021-07-20 13:12:36 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Aronai Sieyes
c0eabb3a28 Merge pull request #11047 from VOREStation/Arokha/qpadtweak 
Quantum pad tweaks
 2021-07-12 23:46:06 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Razgriz
315e4dd96a powder that makes you want to strangle whoever did all this bad coding 2021-06-24 18:49:49 -07:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Razgriz
b287747d4e Merge branch 'master' into upstream-merge-10683 2021-06-20 17:17:44 -07:00
Razgriz
8db51350fc powder that makes you say yes 2021-06-20 16:47:55 -07:00
Razgriz
beadc0efd4 Update gateway.dm 2021-06-20 16:14:08 -07:00
Aronai Sieyes
ac00965e68 cock 2021-06-19 22:03:38 -07:00
Nadyr
c853e6d3d6 powder that makes you say yes 2021-06-19 21:31:24 -04:00
Chompstation Bot
b69e24086a 6 fixes 2021-06-18 18:02:23 +00:00
Novacat
5d69f8878d Merge pull request #10373 from ShadowLarkens/fix_vending 
Initialize all vending products on server start & fix multiple food icons
 2021-05-22 03:50:10 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
9f977f893f Merge pull request #9618 from Novacat/nova-basicfixes 
Some minor fixes
 2021-01-27 22:09:25 +00:00
Novacat
6be0583994 Merge pull request #9565 from VOREStation/upstream-merge-7801 
[MIRROR] Corpse Landmarks Update pt1
 2021-01-12 03:53:39 +00:00
Chompstation Bot
c8e698aac2 Wreck & Debris Field Updates 2020-12-22 15:32:40 +00:00
Chompstation Bot
db1c95c6a7 Move away from Travis CI to GitHub Actions 2020-11-24 19:00:16 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Killian
8198f012d4 wrecked cargogeck for debris field, new decals for movable mack walls 2020-09-20 00:37:58 +01:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Aronai Sieyes
7d69c69f14 VS: Port Bay's lockers and stuff 2020-05-31 12:26:00 -04:00
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates 
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
 2020-05-18 20:30:52 -04:00
Aronai Sieyes
3f4fd59bd0 VS: Fix weird leather thing 2020-05-18 10:28:27 -04:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman
8e26511aa1 Prevents some teleporting abuses with taur riding 2020-02-08 07:45:53 +10:00
Repede
9c61982751 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map 
# Conflicts:
#	code/game/machinery/vending_yw.dm
#	icons/vore/custom_clothes_yw.dmi
#	vorestation.dme
 2019-11-29 19:13:53 -05:00
Heroman3003
69d785ef0c Fixes gateway returning 2019-10-30 11:39:10 +10:00
Hawk_v3
74cc210e21 Merge remote-tracking branch 'server/master' into map 2019-10-05 23:10:09 +01:00
Unknown
0c0bc6773d Fixes issue with gateway landmarks 2019-10-02 01:35:34 -04:00
Sebbe
224ce6582b Hopefully fixes every path 
plz game, I didn't have fun ;w;
 2019-04-16 10:41:04 +02:00
Hawk_v3
8d868fb890 Merge branch 'map' into RadiantMaster 2019-04-14 18:27:05 +01:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Arokha Sieyes
5fe59a1f2a Critical maploader fix 
Definitely do not update the server without this change.
And a gateway tweak thing because that was my original intent with this branch.
 2018-10-13 01:36:26 -04:00