cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,326 Commits 7 Branches 0 Tags
19680cb2ba0ce1e9be2d3b836b4cf224e99397f0
Commit Graph

5644 Commits

Author SHA1 Message Date
Zuhayr
19680cb2ba Compile fix. 2013-06-30 05:15:33 -07:00
Zuhayr
b33e91fbb1 Cleaned up a lot of the module selection code, added Combat module. 2013-06-29 22:14:43 -07:00
Zuhayr
bd864f6dc0 Fixes #3204 2013-06-29 21:12:41 -07:00
Zuhayr
c10137a118 Fixes #3184 2013-06-29 19:08:41 -07:00
Zuhayr
e87348dd8d Quickfix for #3194 2013-06-29 17:56:38 -07:00
Zuhayr
60eeccd2ed Fixes #3198 2013-06-29 17:27:46 -07:00
Zuhayr
3192323c19 Fixes #3200 2013-06-29 16:57:08 -07:00
Zuhayr
9b9cf6dfe0 Merge pull request #3190 from Kilakk/bleeding-edge-freeze 
Fixes #3188 - Mods can now see deadchat
 2013-06-28 23:06:26 -07:00
Zuhayr
1d28bb7cb3 Message tweaks. 2013-06-28 15:55:41 -07:00
Zuhayr
c7bbc3c9b3 Changelog. 2013-06-28 15:53:50 -07:00
Kilakk
6b5bd3ca8d Fixes #3188 - Mods can now see deadchat 
Mods can now see deadchat regardless of whether they're ghosted or not.
Works with the deadchat toggle.
 2013-06-27 23:45:17 -04:00
Zuhayr
f5abc3e041 Syringes now have an increased delay when injecting through a hardsuit. 2013-06-27 17:59:37 -07:00
Zuhayr
6f207a3a14 Fixes #2424 2013-06-27 18:09:48 -07: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
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
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
Zuhayr
aa60c58ecb Allows robots to understand all alien languages. 2013-06-24 22:57:36 -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
bff96e3fb7 Added holobadges, Security-imprintable display accessories. 2013-06-24 20:55:24 -07:00
Zuhayr
7a9b501bc0 Dartgun tweaks, vials. 2013-06-24 02:04:44 -07: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
Cael Aislinn
de91fba835 halved the length of xenoarch scans, scans actually shut down when they exceed the safety by too much 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-06-23 10:27:48 +10:00
Cael Aislinn
73cf13745d depth scanner should now properly show the responsive material of a find 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-06-23 10:25:41 +10:00
Cael Aislinn
6ccaae583f excavation gear belts can now hold pick sets, pick sets can no longer hold hand picks (they spawn in the locker instead), picks and measuring tapes now work much faster 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-06-23 10:25:16 +10:00
cib
3aa3da29be A few fixes to robot organs. 
- Forgot .dme
- Made sure repairs and damage only work on installed modules.
- Removed is_functioning() because it was a silly proc to have.
 2013-06-22 21:41:41 +02:00
Chinsky
6e09f90a24 Merge pull request #3127 from SkyMarshal/master 
Maploader improved: Now loads faster by skipping space tiles and properly parses lists from the mapfile.
 2013-06-22 07:21:58 -07:00
Chinsky
7e19adb045 Merge pull request #3129 from Zuhayr/master 
Various fixes.
 2013-06-22 07:15:58 -07:00
Zuhayr
f77d208d04 Fixes #3131 2013-06-22 22:19:52 -07:00
Zuhayr
146462cbc6 Fixes #2740 2013-06-22 21:55:22 -07:00
Zuhayr
513a9d7ee8 Fixes #3052 2013-06-22 20:22:19 -07:00