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

36410 Commits

Author SHA1 Message Date
Novacat
b6c3cb2cdf Compatibility Fix 2020-02-27 23:56:33 -05:00
Atermonera
4039e26875 Merge pull request #6755 from Neerti/feedback_for_devs 
Devs can now View Feedback
 2020-02-27 23:56:20 -05:00
Atermonera
b1720d2653 Defibrilators can be charged in rechargers 2020-02-27 23:55:07 -05:00
Novacat
c54f8144c8 Merge pull request #6694 from Heroman3003/orange 
Fixes orange sofa recipe name
 2020-02-27 00:53:07 -05:00
Heroman
2af35479b2 Fixes orange sofa recipe name 2020-02-27 15:33:43 +10:00
Novacat
7172be1117 Merge pull request #6684 from Heroman3003/pricefix 
Fixes free clothing dispenser only handing shoes for money
 2020-02-27 00:06:46 -05:00
Heroman
8bba3cdd06 Adds orange sofa recipe 2020-02-27 14:28:57 +10:00
Novacat
aad8aada9f Merge pull request #6690 from VOREStation/upstream-merge-6744 
[MIRROR] Adds holoPDA from Aurora
 2020-02-26 22:45:53 -05:00
Novacat
241accfd3d Merge pull request #6689 from VOREStation/upstream-merge-6747 
[MIRROR] Changes Pigs in a Blanket recipe
 2020-02-26 22:45:27 -05:00
Novacat
f864ddd3c9 Merge pull request #6687 from VOREStation/upstream-merge-6742 
[MIRROR]  Better spriters for liquid dispensers
 2020-02-26 22:44:57 -05:00
Novacat
e6e816c964 Merge pull request #6686 from VOREStation/upstream-merge-6740 
[MIRROR] Adds orange and yellow cloth materials
 2020-02-26 22:44:41 -05:00
Atermonera
1c7dd9631c Merge pull request #6744 from listerla/pda-holo 
Adds holoPDA from Aurora
 2020-02-26 21:04:50 -05:00
Atermonera
d116feb648 Merge pull request #6747 from Neerti/pigs_in_blanket 
Changes Pigs in a Blanket recipe
 2020-02-26 21:02:34 -05:00
Atermonera
21e80b9117 Merge pull request #6742 from listerla/dispenser 
Better spriters for liquid dispensers
 2020-02-26 20:29:59 -05:00
Atermonera
695ea645fe Merge pull request #6740 from Heroman3003/orangeyellow 
Adds orange and yellow cloth materials
 2020-02-26 20:26:40 -05:00
Atermonera
fbe42c39ef Merge pull request #6733 from VOREStation/pol-aitweaks 
Readd some AI features and improve AI buildmode
 2020-02-26 20:16:06 -05:00
Heroman
ee92277ff7 Fixes free clothing dispenser only handing shoes for moeny 2020-02-27 09:32:03 +10: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