Commit Graph

20570 Commits

Author SHA1 Message Date
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
Kelenius
035f551743 Makes use of forceMove 2015-08-21 13:18:19 +03:00
Kelenius
c074f9ee9e Fixes a runtime with lights during explosions 2015-08-21 13:01:35 +03:00
Kelenius
f834263f84 Fixes a borg charger bump runtime 2015-08-21 13:00:57 +03:00
GinjaNinja32
c2cdf9d237 add round duration to status reply 2015-08-21 06:28:44 +01:00
mwerezak
8626fbfd39 Removes the reinforce girder verb 2015-08-20 23:50:40 -04:00
mwerezak
db7ba70415 Adds SS13-like interface for reinforcing girders 2015-08-20 23:50:16 -04: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
mwerezak
efc3121f68 Fixes reinforcing girders through windows, unbalanced span 2015-08-19 20:41:24 -04: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
894b559e29 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-19 07:04:40 +01:00
mwerezak
7f17505e48 Cleans up mob_grab.dm
Moves all of the grab abilities into their own proc instead of having them all dumped into /obj/item/weapon/grab/attack().
2015-08-18 22:02:01 -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
PsiOmega
75c7313c46 On merge changes and map conflict fixes. 2015-08-18 18:19:51 +02:00
PsiOmega
8138815dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-18 18:05:16 +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
a896991657 Even comments need matching spans for Travis to pass. 2015-08-18 11:55:43 -07:00
Zuhayr
1b7f8d7be2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-18 11:32:46 -07:00
Zuhayr
71214d859e Merge with master. 2015-08-18 11:31:10 -07: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
mwerezak
3ea5bfb131 Makes error message print to admins instead of world 2015-08-17 21:12:40 -04:00
mwerezak
e84f693219 Fixes certain antag roles from being unspawnable
Fixes antag roles without certain flags from being unspawnable at round
start. Also adds more debug messages and feedback
2015-08-17 21:11:57 -04:00
mwerezak
dadc6e4b77 Adds logging for admin spawning antags 2015-08-17 21:10:24 -04:00
mwerezak
e1f4551693 Fixes revs being unspawnable
The player has not been spawned yet how can they possibly be a
/mob/living/carbon/human? Also fixes spawning revs via traitor panel.
2015-08-17 21:04:23 -04:00
mwerezak
ef8e3a94a0 Fixes antag datum not respecting restricted_jobs depending on config
Fixes #10657
2015-08-17 21:00:22 -04:00
PsiOmega
439b976272 Admin level doors are now always of the secure variant.
Players keep finding ways to surprise.
2015-08-17 22:41:19 +02:00
Chinsky
a4550dd957 Merge pull request #10699 from PsiOmegaDelta/150817-Robofite
Harm icon state consistency.
2015-08-17 20:32:41 +03:00
GinjaNinja32
e596d3bdd6 Merge pull request #10681 from mwerezak/lighting
Ports fix for #10660
2015-08-17 14:17:53 +01:00
Zuhayr
b9c95148fd Merge pull request #10688 from GinjaNinja32/chemistry-medical-equipment
fix access artifacts from #9263
2015-08-17 04:06:06 -07:00
Zuhayr
0e6a184f10 Merge pull request #10703 from GinjaNinja32/cryostorage
adds admin logs to cryostorage
2015-08-17 04:05:46 -07:00
GinjaNinja32
0c8a2b16e0 adds admin logs to cryostorage 2015-08-17 11:34:26 +01:00
Zuhayr
e61eb26da9 Merge pull request #10701 from GinjaNinja32/virus
fix #10692
2015-08-17 03:11:16 -07:00
Zuhayr
b27811ee07 Merge pull request #10700 from GinjaNinja32/locket
Remove Sabess's custom item from code, it's been replaced with an entry in the new system.
2015-08-17 03:04:42 -07:00
GinjaNinja32
a2817d9b8c fix #10692 2015-08-17 10:54:51 +01:00
GinjaNinja32
4cc31d10d9 Remove Sabess's custom item from code, it's been replaced with an entry in the new system. 2015-08-17 10:31:29 +01:00
PsiOmegaDelta
edebf946d8 Harm icon state consistency.
All icon states relating to the I_HARM intent now all use the same naming convention.
2015-08-17 10:16:39 +02:00
PsiOmegaDelta
9c08b58534 Code relocation. 2015-08-17 09:38:34 +02:00
PsiOmegaDelta
55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/setup.dm
2015-08-17 09:37:49 +02:00
Zuhayr
82a368c0c4 Merge pull request #10690 from NullSnapshot/hotfix
Bandaid fix for process scheduler bloating status tab
2015-08-16 23:54:34 -07:00
NullSnapshot
e99f98e13f No need for the statpanels. 2015-08-16 23:24:25 -07:00