cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 13:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,856 Commits 8 Branches 0 Tags
cfbc3e5352c9680cfaa74a4d3d3e332b51af6464
Commit Graph

671 Commits

Author SHA1 Message Date
Chinsky
cfbc3e5352 Added webbing and vests to lockers. 2013-06-05 21:35:56 +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
Mloc
3d21ec7f5a Merge pull request #2834 from comma/tentacles 
Tentacles
 2013-05-26 11:49:38 -07:00
Mloc
420354d1dc Merge pull request #2860 from CIB/master 
Fix to event no-repetition code
 2013-05-26 11:40:42 -07:00
cib
cab1289511 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2013-05-26 20:43:22 +02:00
meyar
30a39d580f Forgot about airlock access 2013-05-26 14:26:00 -04:00
meyar
61b7aa06ae Remembered to actually add to the changelog 2013-05-26 12:14:18 -04:00
Chinsky
f9b0ba7a49 Added lids for bottles and beakers. 
Click on vessel in hand to put lid on / take it off.
Lids prevent use of syringes and spilling.
 2013-05-26 06:38:38 +04:00
Chinsky
d9e21f05d0 Updated changelog 2013-05-26 05:06:10 +04:00
Chinsky
13e2d8d793 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-26 05:02:07 +04:00
Erthilo
77c51235af Changelog updated and archived. 2013-05-25 22:15:42 +01:00
SkyMarshal
6c8b0c23dc Small fixes, updated changelog. 2013-05-21 23:12:47 -07:00
cib
d7cc42e588 Added wallrot event. 
Also some updates to changelog.
 2013-05-18 21:55:02 +02:00
Mloc
5faabba7fb Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	html/changelog.html

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-05-16 12:21:55 +01:00
Cael_Aislinn
7c6e7d4727 changelog update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-14 13:26:09 +10:00
cib
ad6105b380 Merge remote-tracking branch 'main/master' into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-14 01:29:45 +02:00
Mloc-Argent
27759f47df Merged master into BEF. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 15:43:50 +01:00
Spamcat
15d4cc531a Removed misleading information from changelog.html 
yell at me if you don't like it
 2013-05-04 13:24:40 +04:00
Spamcat
02fd487008 Blood type now saves in savefile. 
fixes #2738
 2013-05-04 13:22:21 +04:00
Spamcat
7da39e3bfd Changelog. 2013-04-30 17:02:57 +04:00
jediluke69
d9d09f7b1d updated the Dreaded changelog 2013-04-24 20:18:15 -04:00
Chinsky
69cb68732b Merge pull request #2699 from NerdyBoy1104/bleeding-edge-freeze 
Changelog update~
 2013-04-24 13:24:25 -07:00
NerdyBoy1104
a710179c9d Changelog update~ includes a small typo fix to faux's recent update too. 2013-04-24 19:17:15 +01:00
NerdyBoy1104
78e934e0d0 Changelog update~ includes a fixed version of faux's changelog 2013-04-24 19:00:56 +01:00
fauxtada
a31bdfffaa changelog 2013-04-24 10:45:54 -07:00