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
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
Verkister
cee26ffa2e Some more simplemob QoL and fixes. 
-Fixes mob radio headset. Now actually hearable and able to be properly put into the mob.
-Makes a bunch of voremobs start with darksight enabled.
-Makes at least the mountable mobs remove the redundant movement cooldown on player control presence.
-Makes some formerly mountable mobs mountable again. (deathclaw, dragon, hippo, horse, panther, rat)
-Snips some redundant the's out of the petting resposes. (No more player pets the the mob)
 2019-12-01 12:51:18 +02:00
Novacat
c8b277096e Merge pull request #6261 from VOREStation/upstream-merge-6547 
[MIRROR] Lamps, Lights, Lackluster!
 2019-11-29 20:27:36 -05:00
Novacat
729222de35 Merge pull request #6260 from VOREStation/upstream-merge-6539 
[MIRROR] Fix the bioprinter
 2019-11-29 20:27:19 -05:00
Anewbe
068e132603 Merge pull request #6547 from TheFurryFeline/TFF-Lamps_Lights_Lackluster 
Lamps, Lights, Lackluster!
 2019-11-29 19:51:34 -05:00
Anewbe
a1e0aa8b90 Merge pull request #6539 from Mechoid/FixBioprinter 
Fix the bioprinter
 2019-11-29 19:51:23 -05:00
Anewbe
12d5118ecc Merge pull request #6550 from listerla/grammar-time 
Fixes two typos (rengeration and Extranneous)
 2019-11-29 19:49:14 -05:00
Unknown
200cb2f5af Enables all channels by default 2019-11-28 14:31:15 -05:00
Unknown
199fffc2d0 Refactors translocators a bit more 2019-11-28 14:22:56 -05:00
Anewbe
e7c7da7db1 Merge pull request #6536 from Nalarac/Capset 
Captain and HoP Headsets Fully Enabled by Default
 2019-11-28 14:15:11 -05:00
Unknown
aa25f5ebbd More Updates 2019-11-27 15:50:54 -05:00
Unknown
5fc3eac8b6 This is a big ship 2019-11-26 21:00:15 -05:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
Novacat
f5b3fedc9c Merge pull request #6203 from Novacat/nova-ert 
Nerfs Chemistry Bag Toting
 2019-11-21 21:08:52 -05:00
Heroman3003
f348d1152a Fixes runtime with alien weeds (#6530) 2019-11-21 03:11:52 -05:00
Atermonera
ec3167e4ce Merge pull request #6525 from TheFurryFeline/TFF-Let_The_Plushies_Live! 
Mouse Plushie Sprite Change
 2019-11-19 14:28:32 -05:00
Unknown
a788cad3d9 Nerfs Chemistry Bag Toting 
Chemistry bags can no longer be carried around in the belt slot, considering the number of chems they can carry they are probably a bit too large for that.
 2019-11-17 15:55:19 -05:00
Novacat
2ee3dcbb27 Merge pull request #6136 from Heroman3003/gateway-faux-fix 
Switches to an alternative system for gateway map use.
 2019-11-15 12:46:55 -05:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Heroman3003
62889c39d9 Removes deprecated code 2019-11-15 08:38:53 +10:00
Novacat
f60b2094a0 Merge pull request #6173 from Very-Soft/vendortime 
New vending machines
 2019-11-13 13:42:19 -05:00
Meghan-Rossi
f8c214ea67 Fix box of service keys being called "box of command keys" 2019-11-12 08:55:43 +00:00
Soft
7e1a5db6c8 New vending machines 2019-11-09 04:20:29 -05:00
Novacat
af52f4e7c3 Merge pull request #6094 from Novacat/nova-pathfinder 
Rarer events, more event variety
 2019-11-08 13:32:45 -05:00