cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,335 Commits 8 Branches 0 Tags
534a588a6a88c47fe48cbf543f42f851b3d0591b
Commit Graph

36335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anewbe
534a588a6a Gun changes (#4185) 
* Various background gun changes

* Forgot to include the sounds, woops

* Fixes some more gun stuff

* Makes the cham gun work again
 2018-02-12 23:12:14 -08:00
Mechoid
dcf7b73320 Merge pull request #4796 from Anewbe/charger_radiation 
Cyborg charger lessens FBP radiation.
 2018-02-12 20:22:53 -08:00
BillyBangles
ef86caf177 Adds decorative bones and bone loot pile (#4800) 
* adds various bones and bone loot pile

credit to schnayy for most of these sprites

* removes the crossbow bolt from the loot list
 2018-02-12 22:13:47 -06:00
Cyantime
a2f3443828 SMES tweaks (#4793) 
* SMES tweaks

* Replace some fireloss with electrocute_act
 2018-02-12 20:39:58 -06:00
Anewbe
b84878a5b7 Merge pull request #4806 from Cerebulon/meatbreadfix 
Fixes Metaphysical Meatbread
 2018-02-12 14:17:50 -06:00
elgeonmb
7b7a15f26f Feb 11 News (#4803) 
* Feb 11 News

* woops

* woops 2 electric boogaloo
 2018-02-12 14:17:18 -06:00
Anewbe
2bcfddb979 Merge pull request #4799 from Verkister/patch-4 
Fixes pAI HUDs not working at all.
 2018-02-12 14:17:02 -06:00
Anewbe
9ffab42b7b Merge pull request #4802 from Cyantime/framestack 
Generalizes stack usage for machine frames.
 2018-02-12 14:08:58 -06:00
PrismaticGynoid
188856be10 Makes More Machines Movable (#4801) 
* Makes More Machines Movable

Adds in the ability to wrench/unwrench a number of machines that previously could not be. Now you're able to move:
Laptop venders!
Seed extractors!
Biogenerators!
Drying racks!
Microwaves!
Cooking machines!
Gibbers!
Chemmasters/Condimasters!
Bioprinters!
Virology machines!
Washing machines!
Tested with no apparent problems.

* Knew I forgot something
 2018-02-12 14:01:14 -06:00
Cerebulon
521b77ae45 Fixes metaphysical meatbread 2018-02-12 06:33:26 +00:00
zaredman
fdc367a4b5 Changes ammo type from 5.56 to 7.62 (#4795) 2018-02-11 19:02:47 -08:00
Mechoid
e28b66b700 Makes Tape work on Nerds, and people without eyes. (#4791) 2018-02-11 19:02:22 -08:00
Anewbe
6f2c47e5a9 Trees take damage from bullets/lasers (#4786) 2018-02-11 18:57:20 -08:00
Anewbe
6e215396d7 Removes the Explorer hood lights (#4787) 2018-02-11 18:54:17 -08:00
Anewbe
7dd4b60a7d Sleeper and Advanced Scanner consoles now find their machines (#4792) 2018-02-11 17:18:30 -08:00
Cyantime
013ba3edb6 Generalizes stack usage for machine frames. 2018-02-11 20:11:32 -05:00
Anewbe
c8f6448f66 Merge pull request #4788 from Mechoid/Viro_Effect_Spam 
Viro Symptoms and Automute now Play Nice
 2018-02-11 15:18:55 -06:00
Verkister
660e359708 Fixes pAI HUDs not working at all. 
-For some whatever reason the things had absolutely no function other than toggling a single pAI specific var that had no code whatsoever connected to it.
 2018-02-11 12:03:51 +02:00
Anewbe
377ca0fe3f Merge pull request #4798 from Anewbe/folder_rename 
Removes a stray space, replaces it with glorious underscore
 2018-02-11 02:05:45 -06:00
Anewbe
46620c4c01 Merge pull request #4797 from Atermonera/changelog4 
Updates changelog
 2018-02-11 01:55:52 -06:00
Anewbe
922506f56a Merge pull request #4790 from Atermonera/obfus_gps 
Lets poi gps units display gps_tag instead of hardcoded string
 2018-02-11 01:54:18 -06:00
Anewbe
b2bbe63e83 Merge pull request #4789 from VOREStation/vplk-ghosts-invisible 
Make ghosts invisible again.
 2018-02-11 01:53:59 -06:00
Anewbe
9688dcb6be Removes a stray space, replaces it with glorious underscore 2018-02-11 01:47:20 -06:00
atermonera
fe983f0323 Updates changelog 2018-02-10 23:35:43 -08:00
Anewbe
2eac03ec08 Adjusts certain simple mobs, adds some things (#4778) 2018-02-10 23:31:03 -08:00
Anewbe
d6b249817d Falling onto space no longer hurts (#4774) 2018-02-10 23:25:54 -08:00
Anewbe
bd2a364cfb Cyborg charger lessens FBP radiation. 2018-02-11 01:21:23 -06:00
Anewbe
64588484bf Mechs can now fall from non-shuttle heights without hurting the occupant (#4776) 2018-02-10 20:03:06 -08:00
Atermonera
d5a7075d72 Typo, oversight in weather datums (#4777) 
* Update sif.dm

* Typo here too

* Missed a spot

* Return->Continue
 2018-02-10 21:15:03 -06:00
Cameron653
e128afbd17 Fixes Typing Indicator (#4773) 
* Fixes text indicator. Works on getting the chat bar to work.

* Getting the text bar to show the typing indicator proved to be impossible.

Seeing as it was cut out 3 years ago for being absolutely broke, I snipped it out of the code.

* Makes the indicator work better
 2018-02-10 18:16:17 -06:00
Leshana
147b21cc47 Make ghosts invisible again. 2018-02-10 18:05:56 -06:00
Mechoid
74c125db39 Makes some viro symptoms less spammy, severely decreased automute chance. 2018-02-10 15:57:09 -08:00
Atermonera
2427dceb37 Lets signal names be mapped 2018-02-10 15:51:49 -08:00
Anewbe
252b2ffa1c Merge pull request #4772 from Atermonera/obfus_gps 
GPS coordinates and POI names are obfuscated
 2018-02-10 17:51:48 -06:00
Anewbe
28e8f4c989 Merge pull request #4771 from Woodratt/02092018_clothingtweaks 
Clothing adjustments and fix
 2018-02-10 17:43:47 -06:00
SubberTheFabulous
f5ca6cd2a2 Adds borer holder sprites (#4768) 
* adds borer holder sprites

* adds borer holder sprites
 2018-02-10 17:27:18 -06:00
Anewbe
e509fa6f94 Merge pull request #4769 from Cyantime/patch-2 
Fixes flag resetting on dirtied/broken microwaves
 2018-02-10 17:26:59 -06:00
Anewbe
78042b8db6 Merge pull request #4760 from Neerti/2/8/2018_door_assembly_fix 
Makes Projectiles Sometimes Pass Through Door Assemblies
 2018-02-10 01:55:38 -06:00
Atermonera
05c62ba9eb Adds EMP mines (#4679) 
* Revert "Update #3? 4?"

* Revert "Revert "Update #3? 4?""

* Adds the disabled mech tools.

* indentation

* Counter-update

* Refactors mine code. Adds emp mines.

* Hecking spaces

* It compiles this time. For real, I swear
 2018-02-10 01:53:54 -06:00
Anewbe
103c83883e Lowercases the Giant Crab name (#4763) 2018-02-09 22:28:58 -08:00
Mechoid
2723e5d336 Higher-tier Mech-Equip Tweak (#4765) 2018-02-10 00:16:15 -06:00
Anewbe
73150947c7 Merge pull request #4766 from Neerti/2/9/2018_poi_adjustments 
POI Adjustments
 2018-02-10 00:14:13 -06:00
Anewbe
05e9ae8cb1 Merge pull request #4767 from Screemonster/twoforthepriceofone 
removes redundant override in human emp_act()
 2018-02-10 00:10:00 -06:00
mistyLuminescence
fa6ff94474 What's Yours Is Mined (#4556) 
* Boom!

* Wires!
 2018-02-09 18:56:46 -08:00
atermonera
fae9c63ccf GPS coordinates and POI names are obfuscated 2018-02-09 16:59:03 -08:00
Woodratt
060e1aed18 Clothing adjustments and fix 
- Utility uniforms can now roll up sleeves
- SAR, Shaft Miner, Explorer can now select webbings in the loadout.
 2018-02-09 15:21:15 -08:00
Anewbe
e58e97c449 Merge pull request #4758 from VOREStation/vplk-airlocks-cycle-to-ext 
"Planetary" Exploration Airlock Controller
 2018-02-09 16:48:43 -06:00
Anewbe
cc710a3afd Merge pull request #4761 from Neerti/2/8/2018_shield_gen_tweaks 
Tweaks Shield Generators
 2018-02-09 16:26:37 -06:00
Anewbe
f5b6f155cc Merge pull request #4762 from Verkister/patch-3 
Fixes vis_enabled becoming unobtainable if something happens to apply plane_holder to mob before client
 2018-02-09 16:26:02 -06:00
Mechoid
736134d10f Merge pull request #4707 from Cerebulon/virologyRetoothing 
Gives Virology teeth again
 2018-02-09 11:49:45 -08:00