cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 8 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

16167 Commits

Author SHA1 Message Date
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Rykka
0b6ace1a3b Smol grammar fix 2020-01-20 18:24:56 -07:00
Rykka
d0f391c650 Earlyport mech fixes, Fix Polecat armor issues 2020-01-20 18:22:05 -07:00
TheFurryFeline
1f99be6906 Light Frame Infinite Steel Fixy (#6633) 
* Light Frame Infinite Steel Fixy

Title.

Changelog Notes: 

- Fixes light frames returning 5 steel per deconstruction when 2 steel is used to create the frame.

* Changelog
 2020-01-19 00:51:24 -05:00
TheFurryFeline
dc0c513086 Changeling Item Name/Desc Fixy (#6624) 
* Changeling Name/Desc Fixy

Minor var fixes for the changeling combat boots variation. Apparently name and desc were flipped around, resulting in abnormal name output when removed from a dead Beta Replicant.

* Changelog
 2020-01-16 02:56:14 -05:00
Novacat
708e0b477e Merge pull request #6463 from VOREStation/upstream-merge-6619 
[MIRROR] Can now (de)construct chem masters
 2020-01-15 23:35:39 -05:00
Novacat
50e38ffaee Merge pull request #6453 from Rykka-Stormheart/shep-dev-micro-mech-fix 
Micro Mech Slot Fix
 2020-01-15 23:27:29 -05:00
Atermonera
7ae5204eaf Merge pull request #6619 from Shadow-Quill/Chem-Master-Building 
Can now (de)construct chem masters
 2020-01-15 23:16:19 -05:00
Atermonera
c50ef77161 Merge pull request #6612 from Shadow-Quill/PDA-Ctrl-Click 
Ctrl+Click now removes pens from PDAs
 2020-01-15 23:08:06 -05:00
Rykka
64e0ba695f Micro Mech Slot Fix 
This shows micro mech slots in the equipment area and allows for them to be properly disconnected.

Credit goes to InsanityKitten for finding and making this fix.
https://github.com/CHOMPStation2/CHOMPStation2/pull/158
 2020-01-15 17:21:58 -07:00
Novacat
aba090c12d Merge pull request #6443 from Heroman3003/slotjumble 
Adjusts job slots slightly
 2020-01-15 17:49:30 -05:00
Unknown
d3aa3bed3c Removes gnomes 
https://cdn.discordapp.com/attachments/173832207784214528/666485419747180554/7f1b99fdd795299aabd6ddef202ecf98.png

This is why we cannot have nice things.
 2020-01-13 22:49:15 -05:00
Heroman
a2fd602b79 Adds extra roboticist slot 2020-01-14 11:33:14 +10:00
Heroman
c933abf19e Adjusts job slots slightly 2020-01-14 11:19:52 +10:00
Heroman
f032c80486 Also buffs vore laws chance for lost voreborgs 2020-01-13 17:55:00 +10:00
Novacat
c7b689246d Merge pull request #6423 from drexample/WE-ALWAYS-DELIVER 
DO YOU NEED A SLICE OF JOY IN YOUR LIFE?
 2020-01-12 22:14:17 -05:00
Novacat
105f13e03c Merge pull request #6424 from drexample/gnot-sure 
You've been gnomed.
 2020-01-12 22:02:41 -05:00
Novacat
4068f95211 Merge pull request #6435 from Heroman3003/dronelimit 
Increases timegate for cyborgs to 3 days
 2020-01-12 17:20:29 -05:00
Heroman
eee8ecd2e5 Increases timegate for cyborgs to 3 2020-01-13 08:04:18 +10:00
Heroman
06b5064a8e Makes drone pods remain active after first attempt, allowing a ghost to click on it to enter 2020-01-13 07:21:48 +10:00
drexample
041db96898 WE ALWAYS DELIVER 2020-01-11 23:22:18 +03:00
drexample
1be4fe8b3c hooh 2020-01-11 06:42:54 +03:00
drexample
747114793c WE ALWAYS DELIVER! 2020-01-11 05:28:00 +03:00
Heroman
b5f0e0affe Fixes wrong gasmask in xenoflorist locker 2020-01-11 10:39:08 +10:00
Novacat
4f6a7972d6 Merge pull request #6404 from Ketrai/iwantdie 
adds food cubes.
 2020-01-09 22:51:32 -05:00
Heroman3003
5f05d26eb9 Merge branch 'master' into resleeving_sickness 2020-01-10 09:43:42 +10:00
Heroman
a9c1f48a93 Adds a single cure pill to vault, doubles amount ERT gets, changes taste 2020-01-10 09:31:51 +10:00
Mechoid
ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
Ketrai
c8531c827f Fixed conflicts. Adds water bottle to the machine coz logic. 2020-01-07 23:07:50 +01:00
Ketrai
9112a9a2b6 Food cubes 
woop


removes a line of unneeded code
 2020-01-07 22:51:12 +01:00
Heroman
e05fdf6258 Fixes clamp issues 2020-01-06 08:37:27 +10:00
Heroman
9490261230 Adds Kitsuhanan Cure for resleeving sickness 2020-01-06 07:15:13 +10:00
Mechoid
c3079004ea GameMaster Tuning (#6593) 
* Actually Game Master but I am an idiot.
 2020-01-05 01:39:28 -05:00
lbnesquik
f2245e7d7d Merge branch 'master' of https://github.com/VOREStation/VOREStation 2020-01-03 22:48:39 +01:00
lbnesquik
e772c1a09b Add ambrosia seed as a somewhat rare loot for trash. 
Why is this good:
- Low level illegal stuff to do
- I can make my pothead characters
- This is like the most common illegal drug ever, so having it being harder to get than size guns or basically anything in R&D is weird.
- What are you going to do with weed besides smoke it anyway?
 2020-01-03 22:47:32 +01:00
Novacat
524ef9ee17 Merge pull request #6349 from Novacat/nova-basicfixes 
Misc Changes and bugfixes
 2019-12-31 18:39:10 -05:00
lbnesquik
377723bcf4 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-30 09:09:51 +01:00
Heroman
572112d28b Fixes AI not being able to resist out of nets 2019-12-29 08:33:10 +10:00
lbnesquik
562df07602 Move the lance sprite to weapons_vr.dmi. 2019-12-26 07:25:49 +01:00
lbnesquik
eace084579 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-26 07:25:05 +01:00
lbnesquik
ae398259ea Introduce more taur clothes. 
- Add medieval style barding for centaurs.
- Add full body options for wolf taurs. (Fat sprites slightly break this)
- Cloak for Drakes
- Botany Apron should work for the majority of taurs and not weirdly cut at the middle.
- WIP lance
 2019-12-25 20:40:21 +01:00
Unknown
dced9171d9 mow 2019-12-25 14:00:18 -05:00
Unknown
63f2fc0f20 Repurposing FTW 2019-12-25 13:54:31 -05:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Novacat
acc510a92e Merge pull request #6354 from VOREStation/upstream-merge-6480 
[MIRROR] Fixes mech projectile armor thinking test projectiles are dangerous
 2019-12-22 11:01:23 -05:00
Unknown
26a1bca72d Compatibility Fixes One 2019-12-22 10:52:45 -05:00
Atermonera
2ec24a29e3 Merge pull request #6580 from Shadow-Quill/APC-AirAlarm-Alt-Click 
APCs/Air Alarms can be (un)locked via altclick
 2019-12-22 01:58:19 -05:00
Atermonera
eeb8310aa2 Fixes mech projectile armor thinking test projectiles are dangerous 2019-12-21 23:58:07 -05:00
Atermonera
6b462af3ee Merge pull request #6569 from TheFurryFeline/TFF-Bulbs_Recycling 
Light Replacer QOL
 2019-12-21 14:31:10 -05:00
TheFurryFeline
1658258d47 Merge remote-tracking branch 'upstream/master' into TFF-Seed_Vendor-Brig_Version 2019-12-19 20:26:57 -05:00