cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,292 Commits 9 Branches 0 Tags
4bcae3a06bef6513420348529360e708d243c061
Commit Graph

10008 Commits

Author SHA1 Message Date
Segrain
4bcae3a06b Examine() update. 2013-06-28 03:33:06 +03:00
Zuhayr
64dfca731b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-27 09:01:01 -07:00
Zuhayr
d89950487a Added a clot timer to wounds. If a wound is smaller than 30 damage, it will stop bleeding after <damage> seconds. More damage increases the counter. 2013-06-27 08:47:15 -07:00
Zuhayr
304be1fe41 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-27 07:27:38 -07:00
Zuhayr
5dbb0bcb87 Changelog. 2013-06-27 06:41:47 -07:00
Segrain
fa0e14652a Revive bugfix. 2013-06-27 02:20:19 +03:00
Zuhayr
6d46297757 Fixes #2947 2013-06-27 07:17:55 -07:00
Zuhayr
b41e92dc01 Fixes #2870 2013-06-27 07:01:42 -07:00
Zuhayr
8eec1d5379 Fixes #3008 2013-06-27 06:30:17 -07:00
Zuhayr
b270c6060d Fixes #3025 2013-06-27 06:22:01 -07:00
Zuhayr
333e59190c Added minimum damage for cutting wounds to bleed visibly. 2013-06-27 02:09:36 -07:00
Segrain
a944cda68e Autopsy fix. 2013-06-26 16:12:32 +03:00
Segrain
91ab249681 Helper update. 2013-06-26 16:11:10 +03:00
Zuhayr
e7cf8fa613 Adjustments to a wonky examine string for vox magboots. 2013-06-26 00:03:03 -07:00
Zuhayr
3c7bd1f527 Dartgun tweaks and vox raider spawn equipment changes. 2013-06-26 00:00:55 -07:00
Zuhayr
a877a2a9a8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-25 23:55:01 -07:00
Zuhayr
e363157b2a Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-25 23:54:47 -07:00
Zuhayr
722a336e2a Attempted fix to non-refreshing window. 2013-06-25 23:30:13 -07:00
Zuhayr
30cce4fc03 Fixes simple animal pinning. 2013-06-25 22:29:44 -07:00
Zuhayr
a0624c4c4d Fixes pinning without embedding. 2013-06-25 22:27:40 -07:00
Zuhayr
a0aa02b815 Fixes broken vox raid spawning, hopefully. 2013-06-25 22:15:32 -07:00
cib
b0cabba481 Fixed a severe bug with robot components. 
There were several desyncs between robot.cell and robot.components["power cell"].installed, leading to very annoying bugs.
 2013-06-25 15:00:58 +02:00
Segrain
29903c46e3 Quickfix for multitile doors. 2013-06-25 11:40:01 +03:00
Zuhayr
aa60c58ecb Allows robots to understand all alien languages. 2013-06-24 22:57:36 -07:00
Zuhayr
289bb33432 Merge branch 'feature' of https://github.com/Zuhayr/Baystation12 2013-06-24 21:07:57 -07:00
Zuhayr
479d7a058f Fixes #3154 2013-06-25 14:07:54 -07:00
Zuhayr
59119fea07 Fixes #3146 2013-06-24 22:09:03 -07:00
Zuhayr
2265e8e0b9 Fixes #2815 2013-06-24 21:55:21 -07:00
Zuhayr
b3ba567099 Fixes #3145 2013-06-24 21:31:38 -07:00
Zuhayr
f5cc695c19 Merged airlock assembly changes and ZAS changes, hopefully. 2013-06-24 21:06:51 -07:00
Zuhayr
bff96e3fb7 Added holobadges, Security-imprintable display accessories. 2013-06-24 20:55:24 -07:00
Zuhayr
12daf1f245 Merge pull request #3158 from Furlucis/master 
Again with the changeling stab aiming
 2013-06-24 20:45:25 -07:00
SkyMarshal
aa85e757d4 Added a better framework for multi-tile doors, pulling works strangely though. 2013-06-24 17:21:55 -07:00
Zuhayr
9f487038f2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-24 16:18:01 -07:00
Furlucis
674269e315 Made changeling absorbing leave proper wounds and be aimable. 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-24 17:35:55 -04:00
Segrain
f97f3596a6 Punctuation fix. 2013-06-24 12:03:47 +03:00
Segrain
ca635a37f3 Conflict fix. I hope. 2013-06-24 12:02:03 +03:00
Segrain
0d6e49742a Typo fix. 2013-06-24 06:06:00 +03:00
SkyMarshal
702fea234a Forgot the files, doh! 2013-06-23 19:53:59 -07:00
SkyMarshal
6d2b9882e4 ZAS fixes, implements multi-tile doors (That work perfectly!) 
That multi-tile firedoor needs love.  Lots of love. (It is missing a lot of icon states)
 2013-06-23 19:49:42 -07:00
Chinsky
d3c6101775 Merge pull request #3144 from Kilakk/bleeding-edge-freeze 
Crew manifests will now put alternate titles of jobs into their correct departments
 2013-06-23 14:50:03 -07:00
Zuhayr
7a9b501bc0 Dartgun tweaks, vials. 2013-06-24 02:04:44 -07:00
Segrain
65731b232b Quickfix and changelog. 2013-06-23 20:52:19 +03:00
Segrain
7fec5309f7 Airlock construction update. 2013-06-23 20:42:58 +03:00
Segrain
1f7d39d99f Stacks update. 2013-06-23 20:31:55 +03:00
Kilakk
1bce99656c Fixes crew manifests showing alt titles as misc 2013-06-23 13:26:25 -04: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
Chinsky
b4822e1600 Merge pull request #3126 from CIB/bleeding-edge-freeze 
Implemented robot components(organs)
 2013-06-22 22:58:04 -07:00
Zuhayr
cfcc3dc689 Merge pull request #3134 from caelaislinn/master 
Xenoarchaeology tweaks
 2013-06-22 21:58:55 -07:00
meyar
6f84917a58 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-23 00:17:13 -04:00