cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,069 Commits 5 Branches 0 Tags
c5ef02af6eb376da8ce32bce94ef8c3d15673b3c
Commit Graph

36167 Commits

Author SHA1 Message Date
Unknown
c5ef02af6e Fixes cataloguer stuff 2020-02-25 15:46:42 -05:00
Unknown
2604093ff0 Species consolidation 
- Consolidates the two zorren species into one zorren species.
- Merges Xenohybrid into Custom species, Xenohybrids no longer whitelisted.
 2020-02-25 15:45:10 -05:00
Novacat
1c80ed2a88 Merge pull request #6622 from Shadow-Quill/Holowarrant 
Holowarrants can now only be authorized by an ID with HoS access
 2020-02-25 10:50:30 -05:00
Novacat
7031f896b9 Merge pull request #6606 from Heroman3003/biochem 
Adds biochemical dispenser to medical's chemistry
 2020-02-25 10:50:00 -05:00
Novacat
7821dcd2bc Merge pull request #6603 from Meghan-Rossi/fluffstuff 
Fluff item
 2020-02-25 10:48:57 -05:00
Novacat
4298fd39eb Merge pull request #6619 from VOREStation/fix-seeds-runtime 
Fix Sundry Runtime Errors
 2020-02-25 10:42:09 -05:00
Atermonera
50d2b5f191 Fixes custom table placement (#6735) 2020-02-25 04:32:22 -05:00
Novacat
c38cbe3c36 Merge pull request #6679 from VOREStation/upstream-merge-6719 
[MIRROR] Adds an In-game Feedback System
 2020-02-24 21:13:33 -05:00
Novacat
34c8458714 Merge pull request #6678 from VOREStation/upstream-merge-6722 
[MIRROR] Fixes MCs not being rechargable
 2020-02-24 21:13:21 -05:00
Novacat
48e022ed1b Update new_player.dm 2020-02-24 20:30:09 -05:00
Novacat
ab9f71f1a5 Update recharger.dm 2020-02-24 20:29:04 -05:00
Novacat
c545032a5f Merge pull request #6677 from VOREStation/upstream-merge-6737 
[MIRROR]  Makes pen click when you click on them
 2020-02-24 20:28:15 -05:00
Novacat
c93c572c52 Merge pull request #6675 from VOREStation/upstream-merge-6731 
[MIRROR] Adds individual modular armour crates, tweaks old prices
 2020-02-24 20:27:43 -05:00
Novacat
8206949d15 Merge pull request #6674 from VOREStation/upstream-merge-6734 
[MIRROR] Removes deadringer cloak exploit
 2020-02-24 20:27:10 -05:00
Novacat
b633165a08 Merge pull request #6673 from VOREStation/upstream-merge-6730 
[MIRROR] Fixes sprites for Ablative & Bulletproof modular armour
 2020-02-24 20:26:51 -05:00
Novacat
650007f9e7 Merge pull request #6672 from VOREStation/upstream-merge-6729 
[MIRROR] Fix and tweak station Railguns.
 2020-02-24 20:26:32 -05:00
Novacat
993f559ac0 Merge pull request #6671 from VOREStation/upstream-merge-6727 
[MIRROR] Adds a *dwoop emote
 2020-02-24 20:26:15 -05:00
Novacat
97b86d4d1d Merge pull request #6670 from VOREStation/upstream-merge-6726 
[MIRROR] Adds holster, lighter, and seatbelt sounds from World Server.
 2020-02-24 20:25:57 -05:00
Novacat
3ba600c785 Merge pull request #6669 from VOREStation/upstream-merge-6723 
[MIRROR] Creates a preference for precise item placement
 2020-02-24 20:25:39 -05:00
Novacat
351b74aeaa Merge pull request #6668 from VOREStation/upstream-merge-6720 
[MIRROR] Helmet Camera Moved Tabs
 2020-02-24 20:25:21 -05:00
Novacat
d4a8a9332b Merge pull request #6666 from VOREStation/upstream-merge-6718 
[MIRROR] Added two chemical spill PoIs + More Immersive PoI Names
 2020-02-24 20:24:35 -05:00
Novacat
f4ce5b417f Merge pull request #6665 from VOREStation/upstream-merge-6683 
[MIRROR] Implements blacklist for specific plant sprites for random seeds
 2020-02-24 20:24:05 -05:00
Novacat
d3cd40d147 Merge pull request #6664 from VOREStation/upstream-merge-6701 
[MIRROR] Hide items in plant pots and plushies
 2020-02-24 20:23:47 -05:00
Leshana
e7700b7af0 Fixed conflicts near a vorestation edit 2020-02-24 19:15:09 -05:00
Leshana
8d8284a2b3 Resolved conflicts 2020-02-24 19:09:53 -05:00
Leshana
25fed81d9f Fixed Runtime in simple_animal_vr.dm,41: Cannot read null.digest_mode 
- Caused by using "Toggle Animal's Digestion" verb on non-vore-capable mobs.
- Even better, changed it to not even add those verbs on mobs without vore
- Also remove the path from VV addverb since it is a proc now.
 2020-02-24 17:57:56 -05:00
Atermonera
772a95c68e Adds an In-game Feedback System 2020-02-24 16:35:08 -05:00
Atermonera
b353ec7d01 Fixes MCs not being rechargable 2020-02-24 16:25:34 -05:00
Atermonera
cc487ceebf Merge pull request #6737 from listerla/penclick 
Makes pen click when you click on them
 2020-02-24 16:20:09 -05:00
Atermonera
138fe4053b Merge pull request #6731 from FenodyreeAv/CargoChange 
Adds individual modular armour crates, tweaks old prices
 2020-02-24 16:17:41 -05:00
Atermonera
0baec55043 Merge pull request #6734 from VOREStation/pol-dead 
Removes deadringer cloak exploit
 2020-02-24 16:17:31 -05:00
Atermonera
ceae103174 Merge pull request #6730 from FenodyreeAv/TestBranch 
Fixes sprites for Ablative & Bulletproof modular armour
 2020-02-24 16:16:18 -05:00
Atermonera
55704e0760 Merge pull request #6729 from Mechoid/RailgunFixxo 
Fix and tweak station Railguns.
 2020-02-24 16:15:04 -05:00
Atermonera
940ca147be Merge pull request #6727 from listerla/dwoop 
Adds a *dwoop emote
 2020-02-24 16:13:50 -05:00
Atermonera
16183867df Adds holster, lighter, and seatbelt sounds from World Server. 2020-02-24 16:12:37 -05:00
Atermonera
89a32f867f Merge pull request #6723 from Heroman3003/placementpref 
Creates a preference for precise item placement
 2020-02-24 16:10:22 -05:00
Atermonera
e168c13c11 Merge pull request #6720 from Nalarac/helmet-cameras 
Helmet Camera Moved Tabs
 2020-02-24 16:09:05 -05:00
Atermonera
5e2a692610 Added two chemical spill PoIs + More Immersive PoI Names 2020-02-24 16:02:31 -05:00
Atermonera
7006fc6fb1 Implements blacklist for specific plant sprites for random seeds 2020-02-24 16:02:21 -05:00
Atermonera
b26daf5fb1 Hide items in plant pots and plushies 2020-02-24 16:01:08 -05:00
Atermonera
c1fe64ba6a Merge pull request #6717 from LeighKnapenberger/master 
Fixes Mint Apple Sparkle having a recipe, but no drink
 2020-02-24 16:00:57 -05:00
Novacat
bfa123c1f0 Merge pull request #6661 from Heroman3003/sofafix 
Makes all sofa colors/subtypes makeable
 2020-02-24 03:35:07 -05:00
Heroman
726664f6f0 Makes all sofa colors/subtypes makeable 2020-02-24 18:19:56 +10:00
Heroman
a5653c6eb2 Better fix for the missing accessories on taurs 2020-02-24 17:39:21 +10:00
Leshana
a92107ad8f Fix bad index and bad arg name runtimes in find_spawning.dm 
* Code was assuming that item.origin_tech would be an initialized list.
  To be safe we use LAZYSET so it will work properly even if its null.
* Other code was calling pickweight and passing it the options as named
  arguments.  They are supposed to be passed as a list.
 2020-02-23 23:50:41 -05:00
Leshana
82603a4978 Fix Runtime in observer_vr.dm,65: Cannot read null.name 
If an observer/ghost was never in the game this round, thier mind var
will be null.  No sense in letting them ping the transcore.
 2020-02-23 22:52:42 -05:00
Leshana
a5af2759e3 Fix Runtime in loadout.dm,277: bad index 
Runtime happens when someone has a saved preferences loadout containing an item that currently is expected to have gear_tweaks, but at the time that the savefile was last saved, did *not* have gear tweaks.  Thus the saved prefs have null metadata.
Also it makes no sense to check the length of a list *inside* a for loop iterating over that list..
TODO - Figure out if its okay to spawn it without the metadata.
 2020-02-23 22:03:21 -05:00
Leshana
9f98153dce Fix Runtime in wires.dm,120: Cannot execute null.is wirecutter(). 2020-02-23 22:03:21 -05:00
Leshana
4325e93e06 Fix Runtime in filter.dm,91: Cannot execute null.set machine() 2020-02-23 22:03:21 -05:00
Leshana
2d05b084d2 Fix Runtime in seed.dm,102: Cannot read null.len 2020-02-23 22:00:36 -05:00