Akai Alonkai
cfa8bf1e97
Probable typo fix
...
September hasn't passed yet, but 1/9 could also be January 9th.
2015-02-18 15:24:33 -05:00
Akai Alonkai
c6b66a1000
Defines icon file for purple comb
...
Fixes #8133
2015-02-18 15:09:40 -05:00
Zuhayr
a2e30b4ee9
Addresses #7744
2015-01-09 09:12:31 +10:30
mwerezak
81890c968e
Adds image for cult talismans
...
So they aren't blank when examined.
2014-12-08 20:45:15 -05:00
Zuhayr
aaf390a58e
Updated changelog.
2014-11-22 08:36:52 +10:30
Zuhayr
b4ea25d064
Merge conflict resolution.
2014-11-10 13:00:06 +10:30
PsiOmega
9618c1945a
Changelog update.
2014-11-08 23:45:15 +01:00
mwerezak
3d7636728c
Fixes #6941
2014-11-06 19:34:14 -05:00
Akai Alonkai
7243fdb284
Add Window Dismantling
...
Enables dismantling of a window (100% return) with a wrench, if the
window is fully unsecured. Windows which cannot be dismantled will
return a message saying so for clarity. Dismantling displays a visible
message for clarity.
2014-11-05 00:24:56 -05:00
PsiOmega
d38e737fdd
Changelog update.
2014-11-01 13:36:54 +01:00
RavingManiac
782e9f520d
Changed the wording of the sniper rifle/binoculars zoom messages.
...
Updated changelog.
2014-10-22 02:19:38 +08:00
Zuhayr
47aa0a2438
Changelog.
2014-10-01 23:34:50 +09:30
Zuhayr
70eedc3486
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite
2014-09-30 12:18:16 +09:30
Gamerofthegame
33b9d19df1
Commit repair
2014-09-28 17:13:42 -04:00
Zuhayr
5c464f50b5
Updated changelog.
2014-09-29 06:19:00 +09:30
Zuhayr
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
mwerezak
5d562b2dd8
Updates changelog
2014-09-20 15:02:52 -04:00
PsiOmega
4e3cccd3c6
Corrects the change log.
...
Removes duplicate header section.
Whitelamma's entries are no longer sub-entries of other changelogs.
2014-09-13 14:30:27 +02:00
Zuhayr
1eb759447e
Merge resolution, using dev-freeze map due to unreconcilable conflicts.
2014-09-13 16:54:48 +09:30
Mloc-Argent
712e209ab6
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/__HELPERS/text.dm
code/game/machinery/podmen.dm
code/game/machinery/vending.dm
code/game/objects/items/candle.dm
code/game/objects/items/devices/PDA/cart.dm
code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
RavingManiac
f388c49df6
Changelog updated
2014-09-05 02:12:29 +08:00
Whitellama
f5c9586153
Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.
2014-08-31 02:12:04 -07:00
Whitellama
b15c74acd0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-08-28 18:29:05 -07:00
Whitellama
aa0ab32a9c
Egg boxes and donut boxes can be constructed from cardboard
2014-08-28 18:27:51 -07:00
Kelenius
cab21fe649
Scrying orb changelog
2014-08-28 18:14:11 +04:00
Whitellama
c6ae920eda
Packages can now be labeled/titled with pens and have sprites to represent they've been labeled or tagged (with the destination tagger)
2014-08-27 13:06:20 -07:00
PsiOmega
22ad867f05
A list of features created since the my last changelog addition.
2014-08-27 14:23:18 +02:00
Whitellama
099f719dc7
Fixed issue from changelog merge
2014-08-21 01:18:40 -07:00
Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
Whitellama
3a7fa00ba3
Updated the changelog.
2014-08-10 15:27:23 -07:00
mwerezak
ac2b8aee02
Updates the changelog
...
Also retroactively adds a bunch of entries that were not added before
2014-08-05 17:05:20 -04:00
Whitellama
f3091cb215
Updated changelog
2014-07-26 17:52:16 -07:00
PsiOmega
b7690008ad
Updates the changelog with relevant AI changes.
2014-07-20 19:36:00 +02:00
Mloc-Argent
87a7eb1398
update changelog for v0.1.13 (thanks zuh)
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-01 15:55:38 +01:00
DJSnapshot
488c4f4b84
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop
...
Conflicts:
code/setup.dm
2014-06-23 00:25:39 -07:00
DJSnapshot
7a5a3d47ae
Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do.
2014-06-22 03:31:06 -07:00
Chinsky
78142a7cc2
Merge pull request #5276 from caelaislinn/xenoarchaeology
...
Xenoarchaeology
2014-06-20 14:41:25 +04:00
Cael Aislinn
a203686f9e
changelog update
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-06-20 18:42:46 +10:00
Chinsky
96e7fea863
Added changelog entry
...
Deleted duplicate marker that bork'd AddToChangelog.exe's Lady Add
2014-06-19 00:49:34 +04:00
Mloc-Argent
9896e44d8a
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/__HELPERS/unsorted.dm
2014-06-12 18:56:26 +01:00
Mloc-Argent
3450a137d2
tools: fix EOL handling in AddToChangelog.exe
...
AddToChangelog.exe was using a mix of \r\n and \n EOLs.
Fully uses \r\n now.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-12 18:43:48 +01:00
Mloc-Argent
f928d9ce77
repo: make changelog easier to merge
...
The changelog now uses union merges to reduce conflicts.
Changed the EOL in changelog.html to CRLF to help even more.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-12 18:43:15 +01:00
Hubblenaut
0f4f317d52
Updated changelog
2014-06-05 22:51:18 -04:00
Zuhayr
1e135f91af
Merge resolution with master.
2014-06-02 12:05:12 +09:30
Jarcolr
1da0a88eb7
My changelog; master changelog to avoid conflicts.
2014-05-31 19:49:08 +03:00
Chinsky
61f00628f1
Added new BBCode tags, for tables and NT logo. Removes html support from paper.
2014-05-28 10:49:24 +04:00
Hubblenaut
3ef8796696
Updated changelog
2014-05-26 04:16:47 +02:00
Mloc-Argent
e1ddec4a73
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/area/Space Station 13 areas.dm
code/game/objects/items/weapons/manuals.dm
code/modules/mob/living/say.dm
code/modules/organs/organ_internal.dm
code/modules/paperwork/paper.dm
code/modules/supermatter/supermatter.dm
html/changelog.html
icons/mob/uniform.dmi
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-03 16:56:19 +01:00
Ccomp5950
7f5b5bb5af
Merge pull request #4851 from thelegendofbrian/pAI
...
pAI GUI Massive Update
2014-04-29 18:49:54 -05:00
Brian Cook
cca92a2e85
Improved GUI for requesting pAI
...
Made the pAI Request Module and the pAI Availability List pretty.
2014-04-26 17:10:37 -07:00
