cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 21:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,139 Commits 6 Branches 0 Tags
df83acadfcc7d858225828bc9783688045258ae6
Commit Graph

36199 Commits

Author SHA1 Message Date
Heroman
df83acadfc Adds Pip's Ears 2020-03-01 12:46:52 +10:00
Heroman
b45f37b7c8 Adds Pip's Cloak 2020-03-01 12:32:31 +10:00
Aronai Sieyes
39d0a8490f Fix madness 2020-02-29 20:00:16 -05:00
Novacat
8175d5d17a Merge pull request #6707 from VOREStation/upstream-merge-6765 
[MIRROR] Brainmechs can use guns again.
 2020-02-29 18:54:40 -05:00
Novacat
b1669f3674 Merge pull request #6708 from VOREStation/upstream-merge-6713 
[MIRROR] Fixes communicator newsfeed app.
 2020-02-29 18:54:22 -05:00
Atermonera
b1e33cd82a Fixes communicator newsfeed app. (#6713) 
* Fixes communicator newsfeed app.
Fixes non-terminal while loop in get_latest_news(), helper.dm
Newscaster posts now have a world.time-esque timestamp number, so they can be (almost) uniquely identified

* whoopsie
 2020-02-29 18:05:50 -05:00
Atermonera
528ba717b6 Merge pull request #6765 from Mechoid/BrainmechTargFix 
Brainmechs can use guns again.
 2020-02-29 18:04:37 -05:00
Novacat
c63ba4a349 Nerfs Chameleon Kit Boxes (#6763) 
* Nerfs Chameleon Kit Boxes

Because of the way chameleon kits start with items, the boxes start with a ton of storage slots to hold all the items. Sometimes people grab the boxes, dump out the original contents and stuff a ton of stuff into them as a result.

This refactors it so that all the chameleon stuff starts in the backpack instead, so chameleon kit boxes themselves are no longer superboxes

* Unnecessary comma
 2020-02-29 18:02:21 -05:00
Novacat
9cb95d4d45 Merge pull request #6702 from VOREStation/upstream-merge-6754 
[MIRROR] Handholding
 2020-02-28 21:39:53 -05:00
Novacat
accfb2c9be Update human_attackhand.dm 2020-02-28 21:21:47 -05:00
Novacat
88d9f94990 Merge pull request #6701 from VOREStation/upstream-merge-6760 
[MIRROR]  Adds 'warble' emote for Skrell
 2020-02-28 21:20:18 -05:00
Atermonera
e47443a58c Handholding 2020-02-28 20:57:32 -05:00
Atermonera
d423427b18 Merge pull request #6760 from listerla/warble 
Adds 'warble' emote for Skrell
 2020-02-28 20:57:22 -05:00
Atermonera
8ced96e75e Merge pull request #6758 from TheFurryFeline/patch-7 
[Oversight] Orion Trail Grammar Fixy
 2020-02-28 20:55:06 -05:00
Novacat
a5ce35be95 Merge pull request #6699 from VOREStation/upstream-merge-6756 
[MIRROR] Fixes various lightning strike bugs
 2020-02-28 01:17:11 -05:00
Novacat
f980fb2381 Merge pull request #6698 from VOREStation/upstream-merge-6755 
[MIRROR] Devs can now View Feedback
 2020-02-28 00:56:07 -05:00
Atermonera
1d4d3afd45 Merge pull request #6756 from Neerti/lightning_fixes 
Fixes various lightning strike bugs
 2020-02-27 23:58:36 -05:00
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