cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 18:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,444 Commits 7 Branches 0 Tags
33917763dfa7035428d23ec6eb4f759cb1518910
Commit Graph

763 Commits

Author SHA1 Message Date
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
Aryn
1ae892d732 Updated the changelog. 2014-02-24 06:43:07 -07:00
Ccomp5950
b6eacfe385 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/admin/verbs/mapping.dm
 2014-02-20 19:23:16 -06:00
Aryn
ebf1b49496 Forgot the changelog. 2014-02-19 18:51:22 -07:00
Joey Haas
1da5d263f2 Added myself to the changelog credits. 2014-02-18 18:13:18 +01:00
Zuhayr
b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
RavingManiac
751219dbfd Added "hide" verb to mousetraps, placing them on the same layer as hidden mice. 
Triggered mousetraps and dead mice will be moved back to the top layer.

Monkeys will no longer move randomly while being pulled.
 2013-12-18 02:08:38 +08:00
Mloc-Argent
b175c6906b Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	html/changelog.html
 2013-12-13 19:13:43 +00:00
Ccomp5950
4a8e7d9b04 Changelog fix, putting Yinadale's stuff up top. 
Hopefully done in a manner in which there shouldn't be any conflicts.
 2013-12-02 10:47:27 -06:00
Zuhayr
69d84931e6 Changelog merge resolution. 2013-12-03 01:07:17 +10:30
Zuhayr
e90fd95a22 Merge resolution. 2013-12-01 15:19:29 +10:30
Chinsky
027b0d8ec6 Merge branch 'master' into dev-freeze 
Conflicts:
	html/changelog.html
 2013-11-30 05:16:49 +04:00
Chinsky
5d3e712d64 Merge branch 'master' into dev-freeze 
Conflicts:
	html/changelog.html
 2013-11-30 05:11:36 +04:00
Zuhayr
d80edab619 Merge resolution. God damn the changelog. 2013-11-29 22:39:33 +10:30
Nanai
a9e8135040 Updated changelog.html 
Swag changelog update.
 2013-11-24 01:15:56 -05:00
Ccomp5950
e562119d21 Changelog update for Master (Ccomp5950) 
Stuff I've worked on since.
 2013-11-23 23:29:42 -06:00
Cael Aislinn
88c059eae6 changelog update 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-29 05:35:02 +10:00
Kilakk
97ddfc1007 Removed a silly duplicate entry in the changelog 2013-10-26 13:36:34 -04:00
Chinsky
29ea7f0d3a Merge branch 'dev-freeze' into dev 
Conflicts:
	html/changelog.html
	maps/tgstation2.dmm
 2013-10-10 14:37:41 +04:00
Mloc-Argent
65f218ee63 Merge branch 'master' into dev-freeze 
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 22:01:16 +01:00
Chinsky
9000854ddc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into viro 2013-10-06 14:10:20 +04:00
Chinsky
35a09b5bfc Changelog 2013-10-06 12:49:37 +04:00
Chinsky
e96c1906af Changelog 2013-10-06 12:18:05 +04:00
Mloc
49c0a30301 Merge branch 'master' into dev 
Conflicts:
	baystation12.dme
	html/changelog.html
 2013-09-26 10:26:03 +01:00
DJSnapshot
c37a1a3b80 Updated Changelog 2013-09-24 23:45:32 -07:00
Kilakk
d48c2a844c Changelog 2013-09-18 20:19:18 -04:00
Erthilo
3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
 2013-09-02 23:32:33 +01:00
Mloc-Argent
51ea24b0fe Genericify this shit. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:17:09 +01:00
Erthilo
547c1e670d Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work. 2013-08-31 20:12:19 +01:00
Erthilo
d0c71c8dc2 Moved maptools to tool/mapmerge. Added midi2piano and AddToChangelog. 2013-08-31 19:10:02 +01:00
Giacomand
83718db6c2 * Added a changelog entry for the return of the AI announcements. 2013-08-26 07:39:43 +01:00
Zuhayr
375437a6cf Changelog merge. I hate the changelog. 2013-08-12 11:20:41 -07:00