cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 5 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

806 Commits

Author SHA1 Message Date
Erthilo
89ffc92168 Fixes text errors in ghost manifest runes and newscasters with apostrophes. 2013-07-30 22:36:42 +01:00
Erthilo
02f7e34f66 Changelog. 2013-07-30 20:43:02 +01:00
Segrain
41e9c591b3 Changelog. 2013-07-28 02:12:02 +03:00
Kilakk
1bb40348b1 Committing changelog 2013-07-26 14:32:33 -04:00
Mloc-Argent
8575b7a286 And once again, did that the wrong way around. Whoops. 
Fully reverts #3316.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-20 18:41:50 +01:00
Mloc-Argent
adc3c14779 Revert #3316 from BEF due to compile errors and (assumed) missing files. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-20 18:38:00 +01:00
LordBraindead
f172e085b1 Update changelog.html 
underped the changelog too
 2013-07-14 21:40:32 +02:00
LordBraindead
08d2e22220 fire update 
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
 2013-07-14 21:20:45 +02:00
comma
da35278439 Merge remote-tracking branch 'remotes/origin/bleeding-edge-freeze' into viro 
Conflicts:
	html/changelog.html
 2013-07-11 02:53:58 +04:00
comma
aaa1228e11 Changelog. 2013-07-11 02:52:36 +04:00
comma
2509e8f836 Changelog entry. 2013-07-09 14:19:05 +04:00
Spamcat
1541b5dec8 Changelog. 2013-07-05 04:44:54 +04:00
Segrain
66265e2689 Recordskeeping update. 2013-07-03 05:55:18 +03:00
Whitellama
e49a80d822 Fixed changelog conflicts 2013-06-30 13:59:24 -07:00
Whitellama
9ec3996cf4 Updated changelog with space ninja gamemode changes 2013-06-26 17:30:32 -07:00
Segrain
ca635a37f3 Conflict fix. I hope. 2013-06-24 12:02:03 +03:00
fauxtada
1b126bd1d5 Changelog - BEF 
Whoopsie, forgot to do a changelog for all the map changes done for this merge~
 2013-06-23 19:33:43 -07:00
Segrain
65731b232b Quickfix and changelog. 2013-06-23 20:52:19 +03:00
Chinsky
c9f6894163 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
 2013-06-23 11:17:03 +04:00
Cael Aislinn
c8fd18a637 changelog update 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-06-23 10:28:15 +10:00
jupotter
97955c7ee2 Updated changelog 2013-06-21 17:38:30 +02:00
Segrain
9a59c967f1 Cyborg update. 2013-06-18 23:49:40 +03:00
Segrain
6c43ff47e9 Changelog update. 2013-06-18 03:05:37 +03:00
Kilakk
ccd7bd6dae Changelog again 2013-06-13 13:02:39 -04:00
Asanadas
7479fd272c Added Malsquando's colored suit to the hop's wardrobe locker. 
Everything should be working correctly.
 2013-06-13 09:41:52 -04:00
Kilakk
7df34d817f Updating the changelog 2013-06-13 00:09:20 -04:00
Chinsky
bb26c5a7cb Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
 2013-06-12 23:11:28 +04:00
Zuhayr
22c3dcfaa9 Changelog. 2013-06-12 20:34:36 -07:00
meyar
6af53ddf1b Change Lawg 2013-06-11 17:07:16 -04:00
Zuhayr
85b945cfbf Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-10 14:42:46 -07:00
Segrain
673f3ddb37 Fix for ordering hidden supplypacks. 2013-06-09 10:25:27 +03:00
Chinsky
e40140be03 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
 2013-06-08 05:55:42 +04:00
meyar
9779a2e204 Chaaaaaange 2013-06-06 18:28:37 -04:00
Chinsky
cfbc3e5352 Added webbing and vests to lockers. 2013-06-05 21:35:56 +04:00
Segrain
65893426ba Bumping into firelocks in exosuit. 2013-06-05 21:02:25 +03:00
meyar
4547248351 changelog 2013-06-05 01:28:26 -04:00
Zuhayr
9e71180e1b Merge conflict resolution, using BEF. 2013-06-05 14:22:04 +09:30
meyar
cf540425c1 changelawg 2013-06-04 02:28:41 -04:00
meyar
f7d8a7218c Changin' that log 2013-06-02 01:37:49 -04:00
Chinsky
ef7ca95743 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into lids 
Conflicts:
	html/changelog.html
 2013-06-01 18:53:02 +04:00
Chinsky
ceddb499d3 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into organ 
Conflicts:
	html/changelog.html
 2013-06-01 18:48:09 +04:00
Chinsky
19a4de4f56 Forgot I commited ribs thing, adding changelog entry. 2013-06-01 18:38:04 +04:00
Chinsky
28b62d0207 Merge branch 'bleeding-edge-freeze' into organ 
Conflicts:
	html/changelog.html
 2013-06-01 18:33:58 +04:00
Chinsky
f5e716d3ac Updated changelog 2013-06-01 18:32:14 +04:00
Chinsky
2cafa9f77b Merge branch 'bleeding-edge-freeze' into lids 2013-06-01 14:50:26 +04:00
Chinsky
d4495d4503 Updated changelog. 2013-06-01 14:35:11 +04:00
Chinsky
5d84360ee5 Mixed derp merge of changelog. 2013-06-01 08:28:39 +04:00
MisterBook
606a510168 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-31 22:58:01 -05:00
Chinsky
de4f4e4788 Merge pull request #2927 from Baystation12/master 
Merging master to BEF
 2013-05-31 19:49:13 -07:00
Segrain
046433502c Update changelog.html 2013-05-31 12:48:45 +03:00