cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,061 Commits 10 Branches 0 Tags
109ef9ac89a84fb152a3d6cd68dcb95536aafa13
Commit Graph

794 Commits

Author SHA1 Message Date
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
Ccomp5950
edd2b4689f Changelog for 0.1.10 2014-04-25 21:55:51 -05:00
Ccomp5950
976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-25 21:14:58 -05:00
Brian Cook
6d67400f74 Refined GUI more 
pAI background updated and no longer externally referenced. Corrected
stray typos. Added more power on/off lights for certain downloaded
modules.
 2014-04-24 18:17:41 -07:00
Brian Cook
b8afd2fc5f pAI GUI changes 
The pAI GUI background image still need to be properly linked.
 2014-04-24 14:04:32 -07:00
Ravensdale
68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-16 21:44:26 -07:00
Jarcolr
3c2df1c9af Adds a changelog of my codings 
It's already been a month! Yipee!
 2014-04-11 03:59:35 +03:00
RavingManiac
ff7a8f43fc Changelog updated. 2014-04-06 14:31:56 +08:00
Ccomp5950
6f55b60120 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	html/changelog.html
 2014-04-04 01:14:31 -05:00
Ccomp5950
5e045674d1 Changelog update for previous merges 2014-03-31 01:50:58 -05:00
RavingManiac
47edd87cdb Updated changelog. 2014-03-30 21:48:51 +08:00
Mloc-Hibernia
d4324901d3 Revert "Merge pull request #4478 from Aryn/master" 
This reverts commit 86941a58f0, reversing
changes made to 65b8215ec7.
 2014-03-24 13:55:41 +00:00
Chinsky
f3bed7b185 Dreaded changelog.html 2014-03-10 20:58:13 +04:00
RavingManiac
1201499a39 Changelog. 2014-03-07 00:49:22 +08:00
RavingManiac
7b9c525276 Minor update to changelog. 2014-03-06 20:24:07 +08:00
RavingManiac
8126611ebf Changelog updated. 2014-03-06 00:05:44 +08:00