cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,453 Commits 8 Branches 0 Tags
f656dd6dfb6f67e81cb155535f0e26af6b6c58f3
Commit Graph

16290 Commits

Author SHA1 Message Date
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
TheFurryFeline
5d46a6290d Brig Safety Lessons 
Changes the vendors in the brig to not have size changing stuff or syringes.

Changelog Notes:

- Removes syringes from Nutrimax.

- Removes grow/shrink shrooms from seed storages.

Note: Do not merge this until after my prior map PR is merged and I've dealt with the conflicts. This change is so minor that resolutions of said conflicts will be speedy.
 2019-12-19 18:51:47 -05:00
Meghan-Rossi
6530bc2e9f Merge remote-tracking branch 'origin/master' into prybars 2019-12-19 20:52:03 +00:00
Novacat
0432002af7 Merge pull request #6327 from VOREStation/upstream-merge-6558 
[MIRROR] Change various global species lists to GLOB versions, adds 2 more event subspecies.
 2019-12-19 15:46:59 -05:00
Novacat
af3939477f Merge pull request #6326 from VOREStation/upstream-merge-6520 
[MIRROR] Clean up dead code obsoleted by outfit system
 2019-12-19 15:46:48 -05:00
Meghan-Rossi
f59e2811e3 Merge branch 'upstream-merge-6520' into prybars 2019-12-19 18:47:49 +00:00
Meghan-Rossi
ef7dfaa6cc Resolve conflicts, fix compile errors 2019-12-19 18:44:47 +00:00
TheFurryFeline
23e3d6c775 Unused Lore 
Changelog Notes:

- Removes a poster that refers to sub-breeds of Prommies in lore that we don't use in Virgo's own lore.
 2019-12-17 21:33:14 -05:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Atermonera
ef75d1c2a0 Clean up dead code obsoleted by outfit system 2019-12-16 00:51:16 -05:00
Novacat
dba6980b8d Merge pull request #6322 from VOREStation/upstream-merge-6567 
[MIRROR] EPv2 x Communicator fix.
 2019-12-15 23:36:47 -05:00
Novacat
8b541d00e3 Update messaging.dm 2019-12-15 23:27:50 -05:00
Atermonera
9ba1566211 EPv2 x Communicator fix. 2019-12-15 14:54:01 -05:00
Atermonera
838b6dce3e Merge pull request #6566 from Mechoid/MultitoolFix 
Fix Multitool Modes
 2019-12-15 14:52:47 -05:00
PrismaticGynoid
b22ec21911 Graffiti selection (#6562) 
* Lets you choose what type of graffiti or rune to draw when vandalizing the floor with crayons or markers. No more drawing and erasing a dozen times to get the exact graffiti you want.

* Puts in Mechoid's suggestion
 2019-12-13 20:37:14 -05:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00
Unknown
f42cd78de3 Fixes Elven Weapons 2019-12-06 19:14:35 -05:00
Unknown
192dd12e7f Attempts to fix Gladius 2019-12-06 18:59:35 -05:00
Unknown
9435f5720d Misc Tweaks Pt. 2 
- Slightly increases Centcom/Modified translocator energy costs
 2019-12-06 18:44:16 -05:00
Unknown
d8392dfe8b More updates 2019-12-06 18:24:18 -05:00
Unknown
a3c48e6eca how did that get deleted 2019-12-06 17:18:05 -05:00
Unknown
062d8ec39c Merge remote-tracking branch 'VOREStation/master' into nova-basicfixes 2019-12-06 17:10:23 -05:00
Unknown
5499e3272f Miscellaneous fixes 
- Fixes holodeck eswords
- Fixes toy swords not showing the blade
- Temporarily disables vent sounds

Fixes #6265
 2019-12-06 17:10:13 -05:00
Novacat
e5c7d83aba Merge pull request #6222 from Novacat/nova-pathfinder 
Centcom/Tether Ship Changes
 2019-12-06 16:06:56 -05:00
Spades
7a77a3296d Merge pull request #6268 from Novacat/nova-branchfix 
Dragor Vendor Changes
 2019-12-06 10:55:28 -05:00
Spades
f977f0988c Merge pull request #6267 from Verkister/yehaw 
Some more simplemob QoL and fixes.
 2019-12-06 10:54:40 -05:00
lolman360
e2b47484c8 Fixy-wixies the fucky-wucky I madey-wadey with toy swords. (#6526) 
* one

* rtwo

* image

* Update material_weapons.dm

* Update toys.dm

* Revert "Update material_weapons.dm"

This reverts commit 1a37bb015a5e503a4c5f0433bc279f15514319a7.

* Revert "image"

This reverts commit 6496dd404d0eb740e158fbc94322f6944f508886.

* Revert "rtwo"

This reverts commit 3b7aacd6c830e52986f2a34abf5b5ccbfbb135f8.

* Revert "one"

This reverts commit 324d188058c0a824c0259e2d6b98f69e563846bd.

* Update toys.dm
 2019-12-05 18:29:06 -05:00
Unknown
3537646c10 Dragor Vendor Changes 
- Hot drinks reduced to 2 thalers
- Ramen reduced to 2 thalers
- Skrellsnax reduced to 2 thalers
- Protein Shake reduced to 15 thalers
- Towel reduced to 20 thalers
- Protein container (Empty) reduced to 1 thaler
- Number of protein shakes per vendor increased to 16
- Liquidprotein cost reduced to 5 thaler
 2019-12-02 11:43:27 -05:00