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
6,651 Commits 5 Branches 0 Tags
a545ebda03af8ca29c0db032dd2ed5a11021c22a
Commit Graph

2558 Commits

Author SHA1 Message Date
CIB
d5f633a79a Radiation protection was unbalanced: A full rad suit would only give 15% protection 2012-07-09 21:30:35 +03:00
SkyMarshal
376706aecd Merge pull request #1457 from CIB/master 
Admins will now be notified if a reported player logs in.
 2012-07-08 12:15:19 -07:00
cib
0bd54bd612 Admins will now be notified if a reported player logs in. 2012-07-08 20:16:18 +02:00
caelaislinn
bfa9fed862 new chemistry reagent and recipe used with xenoarch 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-07-09 01:06:10 +10:00
caelaislinn
4e5a44864b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-08 23:10:29 +10:00
caelaislinn
89ff98a2d0 fix for [name] drops what they were holding, their l_hand malfunctioning! 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-07-08 20:40:52 +10:00
caelaislinn
4100df644d crystals shouldn't spam as much 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-07-08 20:23:07 +10:00
cib
65fb51b7fa Added automatic crew transfer votes. 2012-07-07 18:58:58 +02:00
cib
289efd9fe5 Missing legs will now also slow down movement. 2012-07-07 13:33:26 +02:00
cib
eb8696a919 Fixed bugs in the wire limb repair message. 2012-07-07 11:13:53 +02:00
CIB
72f86d7d2d Regular cable coil can now be used for mending cyborg limbs. 2012-07-07 12:03:28 +03:00
Albert Iordache
276644f601 Merge pull request #1441 from caelaislinn/master 
map fixes and other
 2012-07-06 23:19:53 -07:00
cib
e7b58bde43 Merge github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2012-07-07 07:58:32 +02:00
cib
4a4524e137 Tried to fix the amputee pain problem. 2012-07-07 07:55:05 +02:00
caelaislinn
cf7dd519e5 archaeo item updates/additions, map fixes, fix for ore box icon 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-07-07 09:00:37 +10:00
Albert Iordache
f3f15002ed Merge pull request #1440 from caelaislinn/master 
shielding generator fixes
 2012-07-06 11:09:10 -07:00
CIB
0481a16e3c Merge pull request #1437 from comma/master 
Bugfixes
 2012-07-06 11:01:04 -07:00
CIB
21661e7a75 Bugfix: False code in blood generation. 2012-07-06 19:52:24 +03:00
caelaislinn
34f17b8d90 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-06 11:52:13 +10:00
caelaislinn
613c9457ed shielding circuitboards should be buildable now 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-07-06 11:17:58 +10:00
unknown
46dcfb2d3d Fixes wounds not bleeding and makes gauze stop bleeding 
Fixes issue #1408
 2012-07-05 20:48:08 +03:00
Albert Iordache
4c447d2374 Merge pull request #1436 from caelaislinn/master 
anomaly / research updates, shield generator fixes, resaerch outpost and shuttle dock added to tgstation.dm
 2012-07-05 07:27:31 -07:00
caelaislinn
6d51e57702 artifact files moved to new folder to avoid clutter, mining north outpost repurposed as research outpost, shuttle dock added to research wing (both shuttle dock and outpost require standard research access), modified layout of the anomaly lab slightly 2012-07-05 23:47:35 +10:00
unknown
b1a9b7b66c Found the cause of lasers not damaging humans 
Please be more careful with #define names.
Fixes issue #1427
 2012-07-05 15:09:17 +03:00
caelaislinn
7f21c4530a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-05 20:28:54 +10:00
cib
2e70d5549f Merge branch 'master' of git@github.com:Baystation12/Baystation12 2012-07-05 09:59:02 +04:00
cib
951e691ec4 Fixed a derp 2012-07-05 07:54:49 +02:00
cib
1c19134427 Merge branch 'master' of git@github.com:CIB/Baystation12 2012-07-05 09:43:18 +04:00
cib
ede4c1cb56 Fixed a few more bugs. 2012-07-05 07:43:00 +02:00
cib
9061bb167b Now changes to the arm will also affect the hand where necessary. 2012-07-05 07:35:23 +02:00
cib
7c69c859dd Merge branch 'master' of git@github.com:CIB/Baystation12 2012-07-05 09:23:26 +04:00
cib
d6e575c6b8 Fixed a few bugs. 2012-07-05 07:23:12 +02:00
cib
e92669d155 Merge branch 'master' of git@github.com:CIB/Baystation12 2012-07-05 09:01:34 +04:00
cib
b831a64bc2 Added limb selection to preferences. 2012-07-05 07:00:22 +02:00
cib
dd579bd5fd More work on amorphs. 2012-07-04 17:42:21 +02:00
Erthilo
8acd06ddda Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2012-07-04 09:00:59 +01:00
caelaislinn
cfb1bf3111 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-01 19:44:34 +10:00
Apple_Master
6102489138 Added Jamini and Cubejackal's custom items. I hope. 
Signed-off-by: Apple_Master <cheeckan@gmail.com>
 2012-06-29 16:44:03 +01:00
caelaislinn
a8c727ba1a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-30 01:18:33 +10:00
Erthilo
f4b5961add Added notification for non-whitelisted people. Also updated whitelist with Spaceman96 2012-06-29 03:28:26 +01:00
Erthilo
2f6af975de Fixes extra description damage values. 2012-06-29 02:32:32 +01:00
Erthilo
f5b221bb63 Fixes a few places where if statements wouldn't work due to syntax errors. 2012-06-29 02:31:46 +01:00
Erthilo
a6607a0275 De-yellows blubs sligtly. 2012-06-29 02:25:57 +01:00
Erthilo
079f987c5c Fixes moderators getting verbs they can't use. 2012-06-28 22:59:36 +01:00
Erthilo
95bae4da54 Fixes AI holopad speech not being picked up by tape recorders. 2012-06-28 22:33:07 +01:00
Erthilo
83542c9955 Fixes alien language indicators being overriden. 2012-06-28 22:32:25 +01:00
caelaislinn
4a4d3b0614 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-28 22:56:29 +10:00
Erthilo
5b13fbc6a7 Temp/quick/hotfix for evidence bags. 2012-06-27 23:36:55 +01:00
Erthilo
92b7eb534a Fixes sleeping resting message spam. 2012-06-27 22:34:55 +01:00
Erthilo
1e63e35ab4 Fixes double icons in examine, and random " on his head" " on his groin" messages. 2012-06-27 20:29:40 +01:00