cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,865 Commits 8 Branches 0 Tags
499e8e7ee9b2f51a9e2fae8faaf0d67f16cd86f5
Commit Graph

114 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
ed79946ade [MIRROR] some istype to macros (#9802) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-05 23:01:49 +01:00
CHOMPStation2StaffMirrorBot
5c8417af0f [MIRROR] fix random uplink items (#9676) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-22 22:03:39 +01:00
CHOMPStation2StaffMirrorBot
f7e9f8d12b [MIRROR] Ring/Watch Accessory Transfer (#9489) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-11-19 19:14:32 +01:00
CHOMPStation2
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084) 
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-09-30 21:36:41 +02:00
CHOMPStation2
1d0a5268ee [MIRROR] Adminbus and Shelter Capsule Updates (#8798) 
Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-08-26 08:58:54 +02:00
Cadyn
b90f7ec922 The 515 MegaPR early downport (#7783) 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-27 20:17:32 +01:00
Heroman3003
62d770eafe Character Setup Lore Option Tweaks 2023-03-06 13:29:45 -05:00
Heroman3003
08935eea03 Merge pull request #14330 from Novacat/nova-basicfixes 
Uplink and Pouch Tweaks
 2023-01-16 08:45:22 +00:00
Razgriz
ddb814a248 Merge pull request #5011 from CHOMPStation2/upstream-merge-12899 
[MIRROR] [MIRROR] Adds Sjorgen Inertial Shotgun (by H-H) (ABLE TO BE MERGED)
 2022-09-22 22:17:56 -07:00
Razgriz
1e6801db96 Merge pull request #5016 from CHOMPStation2/upstream-merge-13460 
[MIRROR] [MIRROR] Antag Uplink Medical Adjustments (ABLE TO BE MERGED)
 2022-09-22 21:59:31 -07:00
Razgriz
96bdd8293f powder that makes you say yes 2022-09-22 21:54:03 -07:00
VirgoBot
7c12d5d4fe [MIRROR] Antag Uplink Medical Adjustments (ABLE TO BE MERGED) (#13460) 
* Antag Uplink Medical Adjustments

* Update medical.dm

* Update medical.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-23 01:23:17 +00:00
VirgoBot
4c6658f35e [MIRROR] Uplink Armor Point Adjustments (ABLE TO BE MERGED) (#13509) 
* Uplink Armor Point Adjustments

* Update armor.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-23 01:03:54 +00:00
Novacat
42987ca089 Merge pull request #13566 from VOREStation/upstream-merge-8686 
[MIRROR] Adjustments to Uplink Tools cost
 2022-08-23 22:29:04 +00:00
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
80f5298a18 Ammo Boxes 2022-03-03 21:23:43 +00:00
Casey
cfefb1098e Hastily gives the ERT their suits back 2022-02-07 23:17:22 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Razgriz
f692192d2c Merge pull request #2276 from CHOMPStationBot/upstream-merge-10727 
[MIRROR] Medicine Tweaks
 2021-06-26 13:24:46 -07:00
Chompstation Bot
5cbb0e48e0 Medicine Tweaks 2021-06-23 16:35:01 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Novacat
6c9340a5b5 Merge pull request #10439 from Novacat/nova-heterochromia 
Adds bus mapping units and mapping beacons
 2021-05-27 02:24:41 +00:00
Chompstation Bot
2d30c1c04e Exploration Balance Tweaks 2021-04-26 18:14:21 +00:00
Nadyr
2d6c3c92e6 Merge branch 'master' into upstream-merge-9632 2021-03-30 02:41:50 -04:00
Nadyr
715ca3ef63 Update uplink_items.dm 2021-03-06 01:11:29 -05:00
Chompstation Bot
24b712ec4d [MIRROR] Telecrystals are only stored on the mind 2021-02-13 21:26:38 +00:00
Novacat
aae47359c3 Merge pull request #9654 from Novacat/nova-basicfixes 
Syndicate Cruiser Tweaks
 2021-02-08 00:36:07 +00:00
Chompstation Bot
0a01392af4 Uplink and Adminverb Tweaks 2021-02-02 15:20:23 +00:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Cadyn
e20eb71125 Fix uplinks 2021-01-08 14:42:35 -08:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale 
NanoUI Goes To Brazil
 2020-09-21 14:13:16 -04:00
SubberTheFabulous
378ba4f4c0 Adds two new augments to Traitor uplink 2020-09-20 06:49:58 -04:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
ShadowLarkens
dd4f9c9967 TGUI NTOS - Total Conversion 2020-09-05 17:02:58 -07:00
Cerebulon
f1f2196077 Flavour Enhancement: Guns 2020-07-13 23:06:11 -04:00
Unknown
19d7b71382 More miscellaneous changes 2020-06-14 13:46:16 -04:00
Unknown
bd1fbd13b5 Adds Explorer weapons to Uplink 
Mostly adding a lil bit of variety. Holdout is equal to egun and Frontier carbine equal to laser carbine.
 2020-05-28 17:10:52 -04:00
Unknown
43f4fb49ad Miscellaneous Changes 
- Adds some more uplink stuff based on recent updates
- Purges Xenomorph hybrid whitelist (they are not whitelisted anymore)
- Adds some hybrid cells to the Dropship
 2020-05-03 10:32:46 -04:00
Mechoid
7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Unknown
a6deb3078d Overhauls First Aid Kits 
- Refactors First aid kits to be mostly autoinjector and pill based. No syringes, just autoinjectors and pills. Health analyzers are also removed.
Regular First Aid Kit: 3x Gauze, 2x Ointment, 1x Paracetamol pill bottle, 1x Inaprovaline pill bottle
Toxin First Aid Kit: 1x Dylovene Pill Bottle, 6x Dylovene Autoinjectors
Burn First Aid Kit: 1x Kelotane pill bottle, 6x Dermaline autoinjectors.
Oxy First Aid Kit: 5x Dexalin Plus autoinjectors, 1x Iron pill bottle, 1x Dexalin Pill Bottle
Adv First Aid Kit: Replaces Autoinjector with Assorted Pill bottle (3 Inaprov, 3 Dylovene, 2 Iron, 2 Tramadol, 3 Hyronalin, 1 Spaceacillin pills)
- Buffs default pill bottle contents. This narrows the effectiveness between autogenerated pills and pill bottles, and those brewed up by players.
- Splits Miner autoinjector into four seperate autoinjectors, one for each damage type. Reduces the price in the mining/exploration vendors.
- Tweaks Pill contents for a bit better consistency. Biggest change is that dexalin pills are 7.5u each.
- Changes Vermicetol chemical color to something more reddish.
- Overhauls Internals closet, removed O2 kits from them, adds more emergency spacesuits.
- Removes Organ Kits, Combat First Aid Kits now have a pill bottle with assorted organ repair pills.
- Surgical kits now have a regular health analyzer, and can hold health analyzers.
 2020-04-26 13:38:28 -04:00
Leshana
e2bd546f61 Ports advanced shield generators from Baystation 
- Creates new advanced shield generators, designed to replace old hull and bubble shield generators.
- Upgrades the floor mounted and handheld shield diffusers.
- Makes underfloor shield diffusers actually constructable.
- Handheld diffusers orderable via uplink.
- Removes supply packs and research datums  for the old generators, but leaves their code in place for maps that still use them.
- Integrates with the meteor and electrical storm events.
- Integrates with mob AI (they know how to attack it)
 2020-04-03 00:56:15 -04:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
lolman360
ae859c49e9 [READY] Recolourable energy weapons. (#6507) 2019-11-01 12:38:06 -04:00
Novacat
54aeb32617 Merge pull request #6091 from Novacat/nova-ert 
Uplink additions
 2019-10-21 21:01:06 -04:00
Unknown
7dd592aa05 Uplink additions 
Adds a few tools and medicines to uplinks. Also includes some polaris-side radio tweaks since I forgot I had it on this branch.
 2019-10-21 18:57:44 -04:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Atermonera
ef4c7b6601 Merge pull request #6172 from mistyLuminescence/contacts 
Makeover Kit
 2019-05-28 13:10:09 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00