Commit Graph

1100 Commits

Author SHA1 Message Date
PsiOmega
037a901b22 Changelog update. 2015-06-26 20:34:30 +02:00
PsiOmega
f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm
2015-06-26 20:28:47 +02:00
PsiOmega
dd7d9b851b Updates changelog. 2015-06-26 19:23:47 +02:00
PsiOmega
8843aa2402 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/alarm.dm
	html/changelogs/.all_changelog.yml
2015-06-24 18:15:28 +02:00
PsiOmega
0e471be0e6 Updates changelog. 2015-06-24 17:31:07 +02:00
Zuhayr
130ff67414 Merge pull request #9902 from Baystation12/dev-freeze
Dev freeze
2015-06-23 20:53:38 +09:30
mwerezak
649c59cbc6 Updates changelog 2015-06-22 23:34:22 -04:00
PsiOmegaDelta
f7474f926f Updates changelog. 2015-06-22 17:00:10 +02:00
Zuhayr
8664ecaabe Merge pull request #9837 from PsiOmegaDelta/150616-Uplink
Refactors antag uplink.
2015-06-21 01:22:56 +09:30
PsiOmegaDelta
1558bd5b75 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/toys.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers.dm
	html/changelogs/.all_changelog.yml
2015-06-19 10:19:08 +02:00
PsiOmegaDelta
839b26f927 Changelog entry. 2015-06-19 09:56:16 +02:00
PsiOmegaDelta
5dc4501ad4 Changelog entry. 2015-06-17 15:13:51 +02:00
mwerezak
a4c2b63975 Updates changelog 2015-06-16 16:26:00 -04:00
PsiOmegaDelta
c99c051a8c Updates changelog. 2015-06-16 10:52:50 +02:00
GinjaNinja32
3291e4264c Merge pull request #9829 from comma/ghett_ophthalmology
Updated penlight
2015-06-16 09:14:14 +01:00
Chinsky
97974cbb7a Updated penlight.
Cleaned up code a bit (holy shit those long conditions), axed yet another monkey mode check.
Made penlights aware of organs.
Added few more conditions that could be diagnosed with it - brain damage, drugs use, eye damage (surprising huh)
2015-06-16 00:38:46 +03:00
Zuhayr
30909aaccd Merge pull request #9793 from PsiOmegaDelta/150612-HiveTracking
Ghosts can now follow hivemind speech.
2015-06-13 01:07:49 +09:30
PsiOmega
1256135a26 Changelog update. 2015-06-12 17:20:35 +02:00
PsiOmegaDelta
279277bca9 Changelog entry. 2015-06-12 15:46:20 +02:00
PsiOmegaDelta
784f4d8705 Merge pull request #9792 from Techhead0/requestConsole
Request Console part two: NanoUI
2015-06-12 15:42:27 +02:00
Techhead0
b22afe6a59 Request Console NanoUI and fixes
Converts Request Console UI into NanoUI.
Fixes icon state not changing for normal priority messages.
Fixes consoles being partially operational while broken/unpowered.
Removes code for EXTREME priority messages.
2015-06-11 21:43:27 -04:00
PsiOmega
43a1bd0241 Changelog entry. 2015-06-09 20:04:00 +02:00
PsiOmegaDelta
9541133888 Changelog update. 2015-06-09 12:18:05 +02:00
Chinsky
94406a6430 Merge pull request #9694 from PsiOmegaDelta/150605-Meteors
Ports /tg/'s meteors.
2015-06-08 14:17:57 +03:00
PsiOmegaDelta
78647e0625 Changelog update. 2015-06-08 09:58:06 +02:00
PsiOmega
9be20905a7 Changelog entry. 2015-06-07 13:48:44 +02:00
PsiOmegaDelta
19866f734b Changelog entry. 2015-06-05 16:07:59 +02:00
PsiOmegaDelta
fdb27272d9 Changelog update. 2015-06-05 10:40:06 +02:00
PsiOmegaDelta
c3f0a46c19 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/storage/briefcase.dm
	html/changelogs/.all_changelog.yml
2015-06-05 10:39:41 +02:00
PsiOmegaDelta
cb7fb3aea9 Changelog update. 2015-06-05 10:23:44 +02:00
PsiOmegaDelta
7f9996eece Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-05 10:23:23 +02:00
Chinsky
dcf7f308f6 Merge pull request #9662 from PsiOmegaDelta/150604-SpiderGlow
Giant spider nurses now have a chance of injecting their victims with eggs.
2015-06-05 10:37:58 +03:00
Yoshax
c960fad48e Changes teleportation scroll and spellbook to be only usable by wizards 2015-06-04 20:21:31 +01:00
Yoshax
1711d01e7a Makes special wizard projectile staffs only usable by wizards. 2015-06-04 19:42:06 +01:00
PsiOmegaDelta
6aaacd6063 Changelog entry. 2015-06-04 13:27:44 +02:00
PsiOmegaDelta
2f9abd759e Changelog entry. 2015-06-04 12:25:17 +02:00
PsiOmegaDelta
288e618980 Changelog entry. 2015-06-04 09:23:20 +02:00
PsiOmegaDelta
da873d8992 Changelog update. 2015-06-04 08:22:48 +02:00
PsiOmegaDelta
00953968dd Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-06-04 08:20:00 +02:00
PsiOmegaDelta
094ba6a1fc Changelog update. 2015-06-04 08:11:44 +02:00
PsiOmegaDelta
6c903907c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-04 08:10:49 +02:00
Zuhayr
da3ee37df9 Merge pull request #9638 from PsiOmegaDelta/150602-LawSets
Allows all synths to view the alternative law sets.
2015-06-03 04:00:11 +09:30
Zuhayr
9b82e90ae6 Merge pull request #9643 from Techhead0/prisonBreak2.0
Prison break refactor changelog.
2015-06-03 03:59:40 +09:30
Techhead0
644b164ab9 Prison break refactor changelog. 2015-06-02 13:18:36 -04:00
PsiOmegaDelta
d2cfcdf9d9 Changelog entry. 2015-06-02 15:59:57 +02:00
PsiOmegaDelta
9f76386a7a Changelog entry- 2015-06-02 15:42:22 +02:00
PsiOmegaDelta
971308f42b Changelog entry. 2015-06-02 13:41:56 +02:00
PsiOmegaDelta
2c8c9df9d2 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
2015-06-02 13:35:02 +02:00
PsiOmegaDelta
4d9c4ee9ba Updates changelog. 2015-06-02 13:15:38 +02:00
PsiOmegaDelta
4a976e1ee2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-02 13:13:40 +02:00