cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 21:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,674 Commits 10 Branches 0 Tags
master
Commit Graph
993 Commits
Author SHA1 Message Date
RazgrizandGitHub 0a20fcd5b7 Add frontier marksman rifle to vendor, increase frontier costs 
-Added the frontier marksman rifle to vendor
-Increased frontier phaser costs
 2023-01-20 18:15:29 -07:00
CaseyandCHOMPStation2 5ff3d93601 Merge pull request #14129 from Screemonster/whatsinthebox 
Makes lootboxes a hell of a lot more random
 2022-11-27 18:01:16 +00:00
RazgrizandGitHub edc64dcbdf Merge pull request #4143 from Tasald/Explorationedits 
Explorationedits
 2022-11-14 23:54:29 -07:00
NadyrandGitHub f0e281b4f7 powder that makes you say yes 2022-11-07 17:32:52 -05:00
CaseyandCHOMPStation2 aa860598a2 remove xenoarch tools from mining vender 2022-11-06 17:13:44 +00:00
C.LandCHOMPStation2 0853131f66 Merge pull request #13809 from Heroman3003/abandon-crate-fix 
Adjusts abandoned crate content self-destruct
 2022-09-25 22:42:28 +00:00
NadyrandGitHub f847203a61 powder that makes you say yes 2022-09-25 17:29:00 -04:00
NadyrandGitHub dd731c7474 powder that makes you say yes 2022-09-25 17:25:07 -04:00
NadyrandGitHub a527ae97e4 powder that makes you say yes 2022-09-25 17:21:44 -04:00
CaseyandCHOMPStation2 1550c3bee5 Mining adjustments 2022-09-25 20:47:34 +00:00
TasaldandGitHub 199ce43be6 renamed riot shield to riot shield 2022-09-22 22:50:46 -07:00
CaseyandCHOMPStation2 524cd2e671 Adds personal shield generators. [READY FOR MERGE] 2022-09-23 00:53:41 +00:00
CaseyandCHOMPStation2 ac204e7749 Replaces some old code w/ IsAdvancedToolUser and fixes twohanded weapons for simple_mobs 2022-07-29 20:48:29 +00:00
NadyrandGitHub c5a0f8fb24 Merge pull request #4584 from CHOMPStation2/upstream-merge-13371 
[MIRROR] Fixes in-chat icons being broken in oldchat
 2022-07-20 21:12:22 -04:00
CaseyandCHOMPStation2 48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
CaseyandCHOMPStation2 65c56f646d Merge pull request #13348 from Heroman3003/abandoned-safe 
Makes abandoned crates destroy contents when tamper is detected
 2022-07-17 09:32:45 +00:00
NadyrandGitHub a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
CaseyandCHOMPStation2 b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
CaseyandCHOMPStation2 928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
CaseyandCHOMPStation2 501bb21152 Plating can be built on most ground turfs. 2022-05-22 18:30:08 +00:00
CaseyandCHOMPStation2 be7e0a3c87 Merge pull request #12879 from Runa-Dacino/belt_dagger 
Adds belt slot flag to proto-kinetic machete and subtypes
 2022-05-08 09:42:24 +00:00
TasaldandGitHub 1abc973117 edit and removal 
Increased the  price of the phasers and removed the new armor and denecrotizer from the vendor
 2022-05-01 11:47:26 -07:00
TasaldGitHubRykka Stormheart
 		6544a74295 Update code/modules/mining/ore_redemption_machine/survey_vendor.dm 
Co-authored-by: Rykka Stormheart <54187424+Rykka-Stormheart@users.noreply.github.com>
 2022-04-28 16:33:55 -07:00
TasaldandGitHub df53e85e90 Update survey_vendor.dm 2022-04-23 13:34:41 -07:00
TasaldandGitHub d740295aab Update survey_vendor.dm 2022-04-23 13:33:43 -07:00
TasaldandGitHub 75f416d104 i am durp 
added exploration shield and added price to small pouches
 2022-04-23 13:32:43 -07:00
TasaldandGitHub 1821451f44 comma 2022-04-23 13:23:17 -07:00
TasaldandGitHub 2475a1d9c4 missed some commas 2022-04-23 13:17:47 -07:00
Tasald 54c90cbc1a vendor additions and new armor 2022-04-23 12:55:26 -07:00
Rykka c4488bac04 Fixes 6 year old bug with icon filepaths being override in update_icon 
Specific to mining turfs, but I imagine others might have this.
The reason we don't directly pull from 'icon' is to allow turf making folk to have some fun to play with it, make the icon change only on update, etc.

If preferred, icon_path var can just be set to grab the turf's base icon path, but I prefer the var imo.
 2022-04-10 10:54:44 -06:00
NadyrandGitHub 6fe5e8c1e1 Merge pull request #3991 from CHOMPStation2/upstream-merge-12579 
[MIRROR] The Grand /TG Port - Part 5
 2022-04-04 17:37:57 -04:00
CaseyandCHOMPStation2 60b1eeff99 Merge pull request #12579 from GhostActual/tg-port-5 
The Grand /TG Port - Part 5
 2022-04-03 03:30:56 +00:00
CaseyandCHOMPStation2 3ea4c8b9ea Merge pull request #12577 from GhostActual/tg-port-3 
The Grand /TG Port - Part 3
 2022-04-03 03:28:43 +00:00
NadyrandGitHub 34c742b55e powder that makes you say yes 2022-02-19 20:39:18 -05:00
CaseyandCHOMPStation2 592777ba9b Merge Fixes for 8222 2022-02-19 22:04:54 +00:00
NadyrandGitHub 6e44bb7876 Merge branch 'master' into upstream-merge-12165 2022-02-06 21:53:14 -05:00
NadyrandGitHub 4b2b0c85bc Merge pull request #3614 from CHOMPStation2/upstream-merge-12150 
[MIRROR] mining vendor 1000 thaler reward
 2022-02-06 20:35:33 -05:00
CaseyandCHOMPStation2 e6f02c05a6 The final Item Bank patch? 2022-02-06 23:29:28 +00:00
CaseyandCHOMPStation2 e5665c54cf Merge pull request #12150 from PastelPrinceDan/moni 
mining vendor 1000 thaler reward
 2022-02-06 14:13:55 +00:00
CaseyandCHOMPStation2 84b984a731 Merge pull request #12145 from Hatterhat/t3drill 
makes a single t3 brace actually support its drill
 2022-02-06 14:12:43 +00:00
NadyrandGitHub 001b26fde0 Merge pull request #3465 from CHOMPStation2/upstream-merge-11869 
[MIRROR] Fixes active edges and other minor startup issues in gateway areas
 2021-12-12 06:01:42 -05:00
NadyrandGitHub bb410d704d powder that makes you say yes 2021-12-12 03:32:16 -05:00
RazgrizandGitHub f26f2f1880 powder that makes you say yes 2021-12-10 00:59:15 -07:00
CaseyandChompstation Bot 6fe03ecb47 Merge pull request #11869 from Heroman3003/gatewayaefix 
Fixes active edges and other minor startup issues in gateway areas
 2021-12-10 06:09:18 +00:00
CaseyandChompstation Bot 175bc573fe A Miner Update [forgot to test a thing] 2021-12-10 00:50:47 +00:00
NadyrandGitHub ca6f1be700 powder that makes you say yes 2021-12-05 11:19:00 -05:00
NadyrandGitHub 4bd02ef673 Merge pull request #3140 from CHOMPStationBot/upstream-merge-11701 
[MIRROR] ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs
 2021-10-27 19:30:01 -04:00
NadyrandGitHub 1664d87d43 Merge pull request #3143 from CHOMPStationBot/upstream-merge-11708 
[MIRROR] wacky haphazardly barely thought through standing drill buffs
 2021-10-27 19:26:22 -04:00
CaseyandChompstation Bot 776f39486a Merge pull request #11708 from Hatterhat/drill-buffs 
wacky haphazardly barely thought through standing drill buffs
 2021-10-27 16:10:30 +00:00
Chompstation Bot 318ac12a29 ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs 2021-10-27 16:05:04 +00:00