cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-18 10:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,188 Commits 11 Branches 0 Tags
4a64862c528ffc8a39981696c2c00a7a36609309
Commit Graph
19739 Commits
Author SHA1 Message Date
Zuhayr 4a64862c52 Merge pull request #10839 from mwerezak/antag-fix 
Fixes #10742
 2015-08-24 17:27:47 +09:30
PsiOmegaDelta 0b163b89ae Fixes #10815. 
Now uses audible message. Added a message for deaf mobs.
 2015-08-24 09:16:35 +02:00
Zuhayr ddcf7ec282 Merge pull request #10837 from mwerezak/brainloss-fix 
Fixes adjustBrainLoss
 2015-08-24 15:24:12 +09:30
mwerezak c8da3f0590 Fixes #10742 2015-08-23 22:28:29 -04:00
mwerezak 5bcede5801 Fixes adjustBrainLoss 
adjustBrainLoss() was giving damage to the brain organ and then setting it back to brainloss, undoing the change.
 2015-08-23 20:22:15 -04:00
Chinsky 1a7b0e33a4 Merge pull request #10758 from FrickenChris101/patch-1 
Flashlight Icon toggle fix
 2015-08-24 00:40:26 +03:00
Chinsky 13257b52c4 Merge pull request #10824 from mwerezak/stump-desc-fix 
Fixes limb stump examine text
 2015-08-24 00:31:05 +03:00
Ccomp5950 517b685950 Merge pull request #10822 from mwerezak/antag-fix 
Antag Fixes
 2015-08-23 16:24:42 -04:00
Raptor1628 dfeb43c496 Reduces Detective slots. 
One detective to compensate for Security Officer, requested by Virgil
after Officer PR.
 2015-08-23 15:37:24 -04:00
mwerezak 3c86715474 Fixes limb stump examine text 2015-08-23 15:35:45 -04:00
mwerezak c16d4aca9a Removes unncessary shuffle 2015-08-23 14:49:30 -04:00
mwerezak 161e5c14cd Fixes #10819 2015-08-23 14:34:58 -04:00
mwerezak 20eeb394cb Fixes #10793 2015-08-23 14:34:37 -04:00
Raptor1628 59c500d01b Adds fourth security officer slot. 
Discussed among admins, decision was made to make this change to master
and not dev. Approval from Virgil.
 2015-08-23 13:20:41 -04:00
GinjaNinja32 663aae9786 Merge pull request #10816 from PsiOmegaDelta/150818-RealFunny 
Rig AI fixes.
 2015-08-23 13:33:24 +01:00
volas d31203c70f Sanitize for AI emergency message 2015-08-23 15:24:52 +03:00
PsiOmega c7bd20ceb6 Rig AI fixes. 
Changes how the state for the NanoUI window is selected.
Fixes and optimizes the hardsuit module tab for rig AIs.
Corrects some qdel issues for ejected rig AIs.
 2015-08-23 13:33:10 +02:00
Zuhayr 89f498e3e8 Merge pull request #10811 from mwerezak/qdel 
Fixes
 2015-08-23 07:41:10 +09:30
mwerezak 4afaf9f5fd Cable layer cleanup, cable qdel 2015-08-22 14:35:53 -04:00
mwerezak d62ff87ec9 Fixes #10689 
Also some refactoring of locker stuffing.
 2015-08-22 14:32:15 -04:00
mwerezak e693fae718 Fixes door repair qdel 2015-08-22 14:09:25 -04:00
PsiOmegaDelta 2fbe9ddb8f Merge pull request #10809 from Zuhayr/master 
Species_restricted tweaks
 2015-08-22 18:51:19 +02:00
GinjaNinja32 0edc18b9c7 Merge pull request #10778 from atlantiscze/stabilisedoutputv2 
Corrects supermatter fluctuations v2
 2015-08-22 17:46:19 +01:00
Zuhayr ca4b56cc77 Reapplying some species_restricted cleanup that was merged over. Allows Vox to wear softsuits. 2015-08-23 01:24:49 +09:30
mwerezak 13c760c5bb Fixes #9453 and fixes #10614 2015-08-22 11:09:17 -04:00
mwerezak 70241d576f Merge pull request #10803 from GinjaNinja32/manifest 
add manifest status command
 2015-08-22 09:47:57 -04:00
PsiOmega f1323c35a9 Antags are now never eligible to be patient zero. 
Includes on-station antags. Fixes #10798.
 2015-08-22 14:38:08 +02:00
GinjaNinja32 aff57029e2 add manifest status command 2015-08-22 11:33:25 +01:00
mwerezak cfa8ab3fd0 Removes bear traps from the custodial closet, adds autolathe recipe 2015-08-22 02:31:19 -04:00
Zuhayr 8564db4643 I am a fucking moron. 2015-08-22 04:10:44 +09:30
Zuhayr eb0f48d412 Xenos use bodytype for species_restricted, Vox can wear softsuits. 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 02:54:14 +09:30
Zuhayr bb82f80885 Added get_bodytype() species proc as groundwork for subspecies. 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 02:53:16 +09:30
Zuhayr 8701205783 Pariah nerfs. 
Conflicts:
	code/modules/mob/living/carbon/human/species/outsider/vox.dm
	code/modules/organs/organ_alien.dm
 2015-08-22 02:51:42 +09:30
PsiOmegaDelta 742dde5c25 Gives the medical equipment access a name. 
Requires for guest passes to list the entry. Fixes  #10780.
 2015-08-21 14:01:29 +02:00
GinjaNinja32 c2cdf9d237 add round duration to status reply 2015-08-21 06:28:44 +01:00
Atlantis 5811b6021e Machinery controller now reports amounts of powernets and pipenets as well. 2015-08-20 23:06:52 +02:00
Atlantis e30e461843 Corrects supermatter fluctuations v2 
- Better implementation of #10714
- This fix corrects the issue by merging pipenet process to machinery process to ensure order of execution doesn't change randomly. This shouldn't have any performance effect as pipenet process doesn't have much work anyway (not to be confused with air process that runs ZAS, this one only called process() on each pipenet). Screenshot of profiler (pipenet process highlighted, idle server with one player, engine set up) http://i.imgur.com/ecCg6rS.png
- Unlike previous fix, this does not come with various game-affecting side effects, players shouldn't see a change (except for the fact that odd fluctuations introduced by devmerge disappear). Previous fix buffed engine output as side effect, and caused one TEG to generate considerably more than second TEG, which caused TEGs to begin sparking despite overall output being below 1MW.
 2015-08-20 22:23:45 +02:00
FrickenChris101 a4b3ab1ca5 Flashlight Icon toggle fix 
Just added additional code to update_brightness call and initialize.. Wasn't properly reflecting light being on or off.
 2015-08-19 20:17:59 -04:00
GinjaNinja32 f950ded9af Merge pull request #10737 from PsiOmegaDelta/150818-RealFunny 
Another Hurt/Harm fix.
 2015-08-18 18:52:09 +01:00
GinjaNinja32 9f05c50a7c Merge pull request #10732 from mwerezak/skipjack3 
Fixes #10723
 2015-08-18 18:51:37 +01:00
PsiOmega 0d10d53b65 Another Hurt/Harm fix. 
Apparently clicking the intents directly or cycling through them updates the icons differently. Nice.
 2015-08-18 18:41:24 +02:00
mwerezak b361f9ad12 Fixes #10723 2015-08-18 10:28:06 -04:00
Kelenius cf78446463 Fixes #10730 2015-08-18 16:10:25 +03:00
Kelenius afc5414ed9 Removes a few outdated mob mentions. Fixes a few things. Almost definitely fixes #7570. 2015-08-18 10:48:22 +03:00
mwerezak 7c8c42137e Fixes #10680 2015-08-18 02:54:13 -04:00
Zuhayr f2b2f2a22c Merge pull request #10711 from PsiOmegaDelta/150817-RandomShuttles 
Admin level doors are now always of the secure variant.
 2015-08-17 19:02:20 -07:00
Zuhayr b6e7d33f3d Merge pull request #10715 from GinjaNinja32/irc 
Adds settable rank to IRC messages, changes it so non-admins can see …
 2015-08-17 18:51:53 -07:00
Zuhayr 5cb06f2c00 Merge pull request #10716 from mwerezak/gamemode 
Gamemode fixes
 2015-08-17 18:50:58 -07:00
mwerezak 87da0d4eb5 Fixes missing ), "spam" class 2015-08-17 21:24:59 -04:00
GinjaNinja32 f0c8db3d0f Adds settable rank to IRC messages, changes it so non-admins can see who on IRC is messaging them, and adds the name of the original sender to reply PMs 2015-08-18 02:16:50 +01:00