cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,436 Commits 5 Branches 0 Tags
0cfaf8e70b51b46b15e82a3839ee0c7400bb6537
Commit Graph

694 Commits

Author SHA1 Message Date
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
MisterBook
4dbebba311 Cobpipe fix 
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772

third attempt to merge into BEF. The hey, now..
 2013-05-31 00:27:30 -05:00
MisterBook
40eafb1b3e Attempt to merge to BEF 2013-05-31 00:25:30 -05:00
MisterBook
25d5600d19 Cobpipe fix 
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772

Attempting to merge with BEF
 2013-05-31 00:21:48 -05:00
Segrain
b0251e0afa Update changelog.html 2013-05-30 19:40:19 +03:00
Andrew Carroll
c8359235fb Update changelog.html 2013-05-30 05:13:17 -04:00
Erthilo
3312490691 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-05-29 11:22:40 +01:00
VitrescentTortoise
d7fb1f81ca Fixed xenoarchaeology picksets not being able to hold everything they start with. 2013-05-28 19:58:42 -07:00
VitrescentTortoise
a118605ae4 Added Forcewall fix to changelog 2013-05-28 19:25:49 -07:00
Erthilo
01ef589293 Fixes everyone being able to understand everyone else. 2013-05-28 23:53:49 +01:00
VitrescentTortoise
dd083ae97c Fixing changelog. 2013-05-26 19:30:49 -07:00
VitrescentTortoise
83b5dea0a4 Merge with BEF 2013-05-26 19:23:27 -07:00
VitrescentTortoise
aa68ac375a Edited changelog, made small edit. 2013-05-26 19:00:55 -07:00