cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 03:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,251 Commits 6 Branches 0 Tags
22d13f10c241b835136c00f88f5b27980eca1879
Commit Graph

30489 Commits

Author SHA1 Message Date
RadiantFlash7
22d13f10c2 All my changes so far. 
note to self: Engineering, Perma, civil jobs, and electricity+piping
 2018-02-02 04:57:01 -05:00
Kelshark
dc2a309c6a Smoll fixes to hueg ass update & merge 2018-01-24 21:04:12 -05:00
Kelshark
85f9061592 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/controllers/autotransfer.dm
#	code/datums/supplypacks/contraband.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
 2018-01-24 19:52:12 -05:00
Arokha Sieyes
026fdb1e76 Merge pull request #2827 from shazbot194/Twin-Drills 
Adds twin drills
 2018-01-22 23:11:05 -05:00
Leshana
39433fb45c Print world atom/object initialization progress to world.log to compare against subsystem initialization. 2018-01-22 19:23:10 -05:00
Leshana
cba712992a Fixes #2820 - Vent pumps shutting down after some template loads 
Specific situation happens when power_change() is called before atmos_init is called for the first time()
update_icons has no business modifying variables like use_power.  Just update the icon!
 2018-01-22 19:21:56 -05:00
shazbot194
151e2b2b5b Adds in twin drills 
As the title says.
 2018-01-22 12:09:01 -09:00
Arokha Sieyes
f100ae9627 Merge pull request #2819 from VOREStation/aro-niffix 
Fix some things about AR soul Destroy() ordering
 2018-01-22 14:32:42 -05:00
Arokha Sieyes
0053ef117f Fix some things about AR soul Destroy() ordering 2018-01-22 14:16:48 -05:00
Arokha Sieyes
c32513d036 Merge pull request #2818 from VOREStation/aro-ratio 
Fix ratio join bug
 2018-01-22 13:34:41 -05:00
Arokha Sieyes
9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018 
# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.
 2018-01-22 12:10:19 -05:00
SunnyDaise
10490fa5b4 Food and Drink: Additions and Bugfixes (#4598) 
* Food and Drink
 2018-01-21 22:18:33 -08:00
Arokha Sieyes
8c5603875a Fix ratio join bug 2018-01-21 23:49:13 -05:00
Arokha Sieyes
572aac4afb Merge pull request #2816 from VOREStation/aro-ratio 
Allows setting/enforcing an assistant ratio
 2018-01-21 22:13:33 -05:00
Arokha Sieyes
aaa5acf1d0 Merge pull request #2813 from VOREStation/aro-dormmove 
Move dorms/cafe to Z1
 2018-01-21 21:46:38 -05:00
Arokha Sieyes
5d6d0bae15 Adds an admin verb to toggle it easier 2018-01-21 21:45:36 -05:00
Arokha Sieyes
4792ea713a Allows setting/enforcing an assistant ratio 2018-01-21 21:03:11 -05:00
Leshana
3ccd8efb39 Revert accidental commit of a WIP file. 
This reverts part of commit 62e58702f7.
 2018-01-21 21:01:30 -05:00
Arokha Sieyes
cd480fd323 Fix softshop affected by APC early init 2018-01-21 19:10:16 -05:00
Arokha Sieyes
5673579e86 Merge pull request #2812 from Verkister/trashpoop 
Couple janihound processor fixes.
 2018-01-21 17:49:00 -05:00
Arokha Sieyes
ba5b0c662f Merge pull request #2809 from VOREStation/vplk-multi-engine 
Dynamic Engine Loading
 2018-01-21 17:48:45 -05:00
Arokha Sieyes
4d1293e73b Merge pull request #2807 from VOREStation/aro-xeno 
Ruins xenoarch forever
 2018-01-21 17:43:43 -05:00
Arokha Sieyes
6e07301c03 Merge pull request #2806 from VOREStation/aro-entopics2 
Entopic Framework + AR Features
 2018-01-21 17:43:36 -05:00
Arokha Sieyes
1558cd47df 3 Fixes (#4600) 
* POLARIS: Do this lazily

* POLARIS: Speed up visible_message and audible_message

* POLARIS: Destroy this list rather than cutting it, for future safety
 2018-01-21 16:17:04 -06:00
Anewbe
056933a9e0 Merge pull request #4597 from VOREStation/pol-surgery 
Fixes necrotic organ repair
 2018-01-21 16:16:34 -06:00
Anewbe
18e83bc73f Merge pull request #4575 from Neerti/1/17/2018_meteors2 
Meteors No Longer Hurt Floors
 2018-01-21 16:10:07 -06:00
Verkister
857b2c82f5 just in case 2018-01-21 23:54:14 +02:00
Leshana
71b3ef47a9 Add checks to allow Tesla to fully dissipate once it runs out of energy. 2018-01-21 16:19:13 -05:00
Leshana
62e58702f7 VOREStation Tweaks to the Tesla engine 
* Let you order the Tesla generator from cargo in case you need another one.
* Make the energy ball dissipate very fast if it escapes from confinement, limiting the number of machines it can blow up.
* Reduce devastation on machine destruction so areas are messed up but not just reduced to space.
 2018-01-21 16:19:13 -05:00
Verkister
09e8cd2d95 Couple janihound processor fixes. 
-Fixes ingested decal type remains becoming uncleanable.
-Fixes nonhuman mobs giving human charge. (mouse overload)
-Fixes janigut not swelling up when reaching the limit.
 2018-01-21 21:35:59 +02:00
Anewbe
215bbb89e7 Merge pull request #4595 from Mechoid/Gas_Tank_Extension 
Chainsaw tweaks. Take two.
 2018-01-21 00:40:26 -06:00
Anewbe
1eabad5690 Merge pull request #4593 from Cyantime/surgexploit 
Fixes multisurgery
 2018-01-20 23:44:48 -06:00
Leshana
d7992a17f4 Fix GC issue on radiation sources. 2018-01-21 00:43:43 -05:00
Leshana
6b17e9b85d Enhance orbiting animations to actually support circles. 2018-01-21 00:43:43 -05:00
BillyBangles
bfeda4c28b properly names the communicator watch selector (#4601) 2018-01-20 21:32:44 -08:00
Arokha Sieyes
6e85d6c519 Ruins xenoarch forever 
* Reduces radiation artifact's extreme power
* Just removes scramble artifact until someone wants to make it actually interesting
* Reduce range of tier3 artifacts to max of 100 given the map size
* Dorms protect from anomalies
 2018-01-21 00:29:34 -05:00
Leshana
805897eafb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-20 2018-01-21 00:23:00 -05:00
Arokha Sieyes
8225d30b9e VS: AR Entopics and Soulcatcher projecting (+Worldbender) 2018-01-20 23:29:24 -05:00
Arokha Sieyes
7b55206351 Merge pull request #2802 from Verkister/insertnewinkcartridge 
Fixes prosthetic fabricator not printing our base colors on limbs.
 2018-01-20 22:46:28 -05:00
Arokha Sieyes
b76a3c7f5b Merge pull request #2796 from Cyantime/hypo 
Removes redundant hypospray
 2018-01-20 22:46:20 -05:00
Arokha Sieyes
c127d317f4 POLARIS: Do this lazily 2018-01-20 22:08:58 -05:00
Arokha Sieyes
b7f1c41581 POLARIS: Speed up visible_message and audible_message 2018-01-20 22:08:37 -05:00
Anewbe
c79a75abce Merge pull request #4573 from VOREStation/pol-borghuds 
Removes HUD items from all borgs, makes records 'just work'
 2018-01-20 20:01:54 -06:00
Anewbe
e5b424e9a8 Merge pull request #4588 from VOREStation/vplk-tesla-book 
Added operating manual book for Tesla
 2018-01-20 20:01:38 -06:00
Leshana
d86c5d8b3f Merge pull request #2800 from VOREStation/vplk-he-pipes-fix 
Fix construction of HE pipes, Vents, and Scrubbers Plus qdel issues.
 2018-01-20 15:52:52 -05:00
Anewbe
0ca15243dc Merge pull request #4594 from VOREStation/vplk-he-pipes-fix 
Fix construction of HE pipes, Vents, and Scrubbers Plus qdel issues.
 2018-01-20 13:29:14 -06:00
Atermonera
17accf2e28 Band-aids three runtimes (#4591) 
* Runtime in dna_modifier.dm,330: Cannot read null.occupant

* Runtime in Chemistry-Reagents.dm,47: Cannot execute null.remove reagent().

* Runtime in blood.dm,182: Division by zero

* Compiled with the right map this time
 2018-01-20 13:28:51 -06:00
Arokha Sieyes
378806471a Remove relative pathing from debridement surgery 2018-01-20 12:34:39 -05:00
Arokha Sieyes
1cc3e02dab Fixes necrotic organ repair 2018-01-20 12:30:18 -05:00
Verkister
da7576451f Fixes prosthetic fabricator not printing our base colors on limbs. 
-Lifelike torsos used to get our species base color applied because they were spawned as mobs with the base color being in the human set species proc.
-Made the prosfab look up and apply those base colors on mobless limbs as well.
 2018-01-20 11:35:36 +02:00