cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,682 Commits 6 Branches 0 Tags
421aa33c40e8e5a6075fde9e7c84cfd6e7ab9195
Commit Graph

30813 Commits

Author SHA1 Message Date
Anewbe
9688dcb6be Removes a stray space, replaces it with glorious underscore 2018-02-11 01:47:20 -06: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
Aronai Sieyes
7ff0493074 Merge pull request #2998 from Jwguy/Silver-AwooCosplayCrate 
AwooCosplayCrate
 2018-02-10 23:06:35 -06:00
Aronai Sieyes
526e886a21 Merge pull request #2994 from Verkister/badboi 
Adds a fancy new voremob.
 2018-02-10 23:04:47 -06:00
Aronai Sieyes
edb2610633 Merge pull request #3000 from Jwguy/Silver-ContrabandUpdate 
Silver-ContrabandUpdate
 2018-02-10 22:59:28 -06:00
Silver
8c3c0430f6 Correct Origin Tech Values 2018-02-10 22:29:46 -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
Silver
ab40c9d38c Added Preferred Change to Deactivation Text 2018-02-10 18:26:51 -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
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
Verkister
519adc1c3e Update badboi.dm 2018-02-10 23:36:24 +02:00
Verkister
d740ae6f90 Fixes itemweak gurgles and food misbehaving 
-Itemweak gurgles no longer add everything unconditionally to items_preserved list even if the item was digested for being food/holder/organ.
 2018-02-10 20:25:39 +02: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
Cyantime
9616467df2 Fixes flag resetting on dirtied/broken microwaves 2018-02-09 11:58:22 -05:00
Screemonster
47319874fb removes redundant override in human emp_act() 2018-02-09 06:19:02 +00:00
Neerti
5532894cde POI Adjustments 
Drone subtype added that is slower than the regular type, so that fleeing is an option now.
All drones on surface POIs have been replaced by this subtype.
Fixes power issues in several POIs.
Makes POI SMESes more robust and start full.
APCs in POIs will no longer send an alert to the station.
Fixes missing area in bonfire POI.
Tweaks name and desc of big stompy drone mechas.
 2018-02-09 00:26:21 -05:00
Cerebulon
2e0d873ba5 Fixed duplicate deafness 2018-02-09 03:46:44 +00:00
Silver
8c36391925 Propernaming for VIRGO PR#3000 
https://github.com/VOREStation/VOREStation/pull/3000
 2018-02-08 17:45:12 -06:00
Silver
5bfca77f04 Proper Naming for VIRGO PR #3000 
https://github.com/VOREStation/VOREStation/pull/3000

Adds Propernaming
Adds Contraband Variable
 2018-02-08 17:43:23 -06:00
Anewbe
f0ce7f9643 Falling one floor is no longer a death sentence (#4759) 2018-02-08 12:59:24 -08:00
Mechoid
251297a2ba Promethean Balancing, Lore-compliant Modification of Security Equipment (#4722) 
* Works on Balancing Prometheans

* Reorganize from Master Merge

* Tries to fix that gun conflict that the DMI merger apparently did fine?
 2018-02-08 14:58:17 -06:00
mistyLuminescence
4e4ba35444 Surgeon/Research/Medimerc borg fixes. (#4751) 
* Surgeon borg fixes.

* Merc combat medic borgs too.

* No med stacks

* chembags

* no chem bags (sorry, I tried!)
 2018-02-08 14:44:41 -06:00
Anewbe
f25da053a7 Merge pull request #4753 from Atermonera/ethyl_fix 
Ethylredox removes alcohol
 2018-02-08 14:36:12 -06:00
Anewbe
62d1e6c00d Merge pull request #4757 from Cyantime/patch-2 
Reduces armor values on the vey-med voidsuit
 2018-02-08 14:34:12 -06:00
Anewbe
1642848db7 Merge pull request #4754 from VOREStation/vplk-id-refactor 
Fix IDs so they do not instantiate every job datum on New
 2018-02-08 14:32:42 -06:00
BillyBangles
64b98e0dae Adds 2 new cave POIs (#4743) 
* adds temple and ritual POIs

as well as ever-burning candles, a candleabra, and a neat red crystal that looks like supermatter but isn't

* fixes all cases of 'candelabra' spelling

i am a dunce

* fixes main map changes

i don't even know what i fuckin did to this thing??? ?? ??? ???

* removes unnecessary light() proc
 2018-02-08 14:10:02 -06:00
Cameron653
1bb37998eb Makes teshari hide work once more. (#4745) 
* Makes teshari hide work (+1 squashed commits)

Squashed commits:

[93fd7b7] Makes teshari hide function correctly oncemore.

* Changes the stun check to a method that actually works.

* boop~
 2018-02-08 14:08:19 -06:00
Silver
13b710fb61 Silver-ContrabandUpdate 
Adds AwooCrate and MlemCrate to Contraband Supplypack. (These show up under 'supplies' in a hacked cargo console and are quite expensive)
 2018-02-08 13:01:51 -06:00
Silver
ef4d87a352 AwooCosplayCrate 
Adds Wolfgirl Cosplay Crate to Supplypacks under Recreation.

Adds Wolfgirl Replica Sword and Autumn Shield.

Adds the above and three existing items to aforementioned crate.
 2018-02-08 12:57:18 -06:00
Verkister
78533e328b Fixes vis_enabled becoming unobtainable* 
*(If something happens to apply plane_holder to mob before login)
Yeah a feature somewhere down there relied on the mob getting its plane_holder before client (and thus making the only vis_enabled init right here that required the lack of plane_holder on login completely unobtainable) and I was vaguely told to fix this here instead of fixing the forementioned downstream feature.
 2018-02-08 19:27:24 +02:00