Commit Graph

10604 Commits

Author SHA1 Message Date
Chinsky
1a7b0e33a4 Merge pull request #10758 from FrickenChris101/patch-1
Flashlight Icon toggle fix
2015-08-24 00:40:26 +03:00
mwerezak
39feaf0870 Space areas no longer use dynamic lighting 2015-08-23 17:05:56 -04: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
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
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
mwerezak
13c760c5bb Fixes #9453 and fixes #10614 2015-08-22 11:09:17 -04:00
GinjaNinja32
4e56b82ec0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-22 15:28:49 +01:00
mwerezak
cfa8ab3fd0 Removes bear traps from the custodial closet, adds autolathe recipe 2015-08-22 02:31:19 -04:00
Zuhayr
3c477dfa5e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
2015-08-22 03:11:53 +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
Kelenius
035f551743 Makes use of forceMove 2015-08-21 13:18:19 +03:00
Kelenius
f834263f84 Fixes a borg charger bump runtime 2015-08-21 13:00:57 +03: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
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
GinjaNinja32
9f05c50a7c Merge pull request #10732 from mwerezak/skipjack3
Fixes #10723
2015-08-18 18:51:37 +01:00
PsiOmega
75c7313c46 On merge changes and map conflict fixes. 2015-08-18 18:19:51 +02:00
mwerezak
b361f9ad12 Fixes #10723 2015-08-18 10:28:06 -04:00
mwerezak
7c8c42137e Fixes #10680 2015-08-18 02:54:13 -04: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
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
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
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
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
PsiOmegaDelta
55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/setup.dm
2015-08-17 09:37:49 +02:00
PsiOmegaDelta
1dcdb423c7 Merge pull request #10685 from mwerezak/skipjack
Fixes
2015-08-17 06:56:50 +02:00
GinjaNinja32
917f6f0250 Add Medical Equipment access to Chemists 2015-08-17 05:45:34 +01:00
mwerezak
f09b754a19 Fixes #10636 2015-08-16 15:20:59 -04:00
mwerezak
887a515483 Fixes #10659 2015-08-16 14:58:50 -04:00
mwerezak
524548cc95 Fixes #10680 2015-08-16 14:58:27 -04:00
PsiOmega
21fd8d825d Makes the private AI channel truly private. 2015-08-16 15:43:28 +02:00